diff --git a/mozilla/webtools/bugzilla/template/default/attachment/contenttypes b/mozilla/webtools/bugzilla/template/default/attachment/contenttypes
index 0328da2ecb6..4e7cafc4718 100644
--- a/mozilla/webtools/bugzilla/template/default/attachment/contenttypes
+++ b/mozilla/webtools/bugzilla/template/default/attachment/contenttypes
@@ -1,3 +1,24 @@
+<!-- 1.0@bugzilla.org -->
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
           <option value="text/plain">plain text (text/plain)</option>
           <option value="text/html">HTML source (text/html)</option>
           <option value="image/gif">GIF image (image/gif)</option>
diff --git a/mozilla/webtools/bugzilla/template/default/buglist/buglist-rdf.rdf.tmpl b/mozilla/webtools/bugzilla/template/default/buglist/buglist-rdf.rdf.tmpl
index 4cf480dcc97..c8beb50e32f 100644
--- a/mozilla/webtools/bugzilla/template/default/buglist/buglist-rdf.rdf.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/buglist/buglist-rdf.rdf.tmpl
@@ -1,3 +1,4 @@
+[% template_version = "1.0@bugzilla.org" %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
@@ -19,6 +20,7 @@
   #%]
 
 <?xml version="1.0"?>
+<!-- [% template_version %] -->
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:bz="http://www.bugzilla.org/rdf#">
 
diff --git a/mozilla/webtools/bugzilla/template/default/buglist/buglist-simple.html.tmpl b/mozilla/webtools/bugzilla/template/default/buglist/buglist-simple.html.tmpl
index c2e4e682388..883b278d7f2 100644
--- a/mozilla/webtools/bugzilla/template/default/buglist/buglist-simple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/buglist/buglist-simple.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/buglist/buglist.html.tmpl b/mozilla/webtools/bugzilla/template/default/buglist/buglist.html.tmpl
index 37a202fe503..150ac2c5403 100644
--- a/mozilla/webtools/bugzilla/template/default/buglist/buglist.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/buglist/buglist.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/buglist/change-form.tmpl b/mozilla/webtools/bugzilla/template/default/buglist/change-form.tmpl
index 60c1a2de764..c7c8d00bf7e 100644
--- a/mozilla/webtools/bugzilla/template/default/buglist/change-form.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/buglist/change-form.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/buglist/table.tmpl b/mozilla/webtools/bugzilla/template/default/buglist/table.tmpl
index 59cd5ac8338..2afc9bb9d63 100644
--- a/mozilla/webtools/bugzilla/template/default/buglist/table.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/buglist/table.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/prefs/account.tmpl b/mozilla/webtools/bugzilla/template/default/prefs/account.tmpl
index 2033e86fc77..e1675c7fb34 100644
--- a/mozilla/webtools/bugzilla/template/default/prefs/account.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/prefs/account.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/prefs/email.tmpl b/mozilla/webtools/bugzilla/template/default/prefs/email.tmpl
index bbcc4365cd9..f7d529c7c99 100644
--- a/mozilla/webtools/bugzilla/template/default/prefs/email.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/prefs/email.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/prefs/footer.tmpl b/mozilla/webtools/bugzilla/template/default/prefs/footer.tmpl
index 2421c71686d..ea5753f0e44 100644
--- a/mozilla/webtools/bugzilla/template/default/prefs/footer.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/prefs/footer.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/prefs/permissions.tmpl b/mozilla/webtools/bugzilla/template/default/prefs/permissions.tmpl
index 56429a78d62..7ab7f1df999 100644
--- a/mozilla/webtools/bugzilla/template/default/prefs/permissions.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/prefs/permissions.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/show/navigate.html.tmpl b/mozilla/webtools/bugzilla/template/default/show/navigate.html.tmpl
index 685539e01f6..3713e0a0d06 100644
--- a/mozilla/webtools/bugzilla/template/default/show/navigate.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/show/navigate.html.tmpl
@@ -1,3 +1,4 @@
+<!-- 1.0@bugzilla.org -->
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
diff --git a/mozilla/webtools/bugzilla/template/default/sidebar/xul.tmpl b/mozilla/webtools/bugzilla/template/default/sidebar/xul.tmpl
index 6bae21631f8..02ee1bf9bd8 100644
--- a/mozilla/webtools/bugzilla/template/default/sidebar/xul.tmpl
+++ b/mozilla/webtools/bugzilla/template/default/sidebar/xul.tmpl
@@ -1,4 +1,4 @@
-[%# 1.0@bugzilla.org %]
+[% template_version = "1.0@bugzilla.org" %]
 [%# -*- mode: sgml -*- %]
 [%# The contents of this file are subject to the Mozilla Public
   # License Version 1.1 (the "License"); you may not use this file
@@ -21,6 +21,7 @@
   #                 Scott Collins <scc@mozilla.org>
   #%]
 <?xml version="1.0"?>
+<!-- [% template_version %] -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="[% Param('urlbase') %]css/panel.css" type="text/css"?>
 <window