diff --git a/mozilla/webtools/bugzilla/Attachment.pm b/mozilla/webtools/bugzilla/Attachment.pm
index 9f46fd0839f..1ba194d77be 100644
--- a/mozilla/webtools/bugzilla/Attachment.pm
+++ b/mozilla/webtools/bugzilla/Attachment.pm
@@ -42,7 +42,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => 'template/default' ,
+    INCLUDE_PATH => 'template/custom:template/default' ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm b/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
index 9f46fd0839f..1ba194d77be 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
@@ -42,7 +42,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => 'template/default' ,
+    INCLUDE_PATH => 'template/custom:template/default' ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }
diff --git a/mozilla/webtools/bugzilla/attachment.cgi b/mozilla/webtools/bugzilla/attachment.cgi
index d908a5ebd29..e5c3f52fe13 100755
--- a/mozilla/webtools/bugzilla/attachment.cgi
+++ b/mozilla/webtools/bugzilla/attachment.cgi
@@ -45,7 +45,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/default" ,
+    INCLUDE_PATH => "template/custom:template/default" ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }
diff --git a/mozilla/webtools/bugzilla/editattachstatuses.cgi b/mozilla/webtools/bugzilla/editattachstatuses.cgi
index 9feb9a765d6..6596a79c991 100755
--- a/mozilla/webtools/bugzilla/editattachstatuses.cgi
+++ b/mozilla/webtools/bugzilla/editattachstatuses.cgi
@@ -45,7 +45,7 @@ use Template;
 my $template = Template->new(
   {
     # Colon-separated list of directories containing templates.
-    INCLUDE_PATH => "template/default" ,
+    INCLUDE_PATH => "template/custom:template/default" ,
     # Allow templates to be specified with relative paths.
     RELATIVE => 1 
   }