diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index b1aa8b46708..14ca862059a 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9061
\ No newline at end of file
+9062
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 0ff354d2cf0..73a4cacdb67 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-ea10fefd22eea012cbd7812e35e45e648eb21df8
\ No newline at end of file
+944b3270eebfc3a419c8917406d0754d8e92d0bb
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
index e4472c5728a..f7cb57fd83f 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
@@ -364,11 +364,10 @@
 
     [% IF Param("usetargetmilestone") && bug.target_milestone %]
       <tr>
-        <th class="field_label">
-          <label for="target_milestone">
-            <a href="page.cgi?id=fields.html#target_milestone">
-            Target&nbsp;Milestone</a></label>:
-        </th>
+        [% INCLUDE "bug/field-label.html.tmpl"
+          field = bug_fields.target_milestone
+          editable = 1
+        %]
         [% PROCESS select selname = "target_milestone" %]
       </tr>
     [% END %]
@@ -547,17 +546,11 @@
   
   [% IF use_keywords %]
     <tr>
-      <th class="field_label">
-        <label for="keywords" accesskey="k">
-          <a href="describekeywords.cgi"><u>K</u>eywords</a></label>:
-      </th>
-      <td class="field_value" colspan="2">
         [% INCLUDE bug/field.html.tmpl
-           bug = bug, field = bug_fields.keywords, value = bug.keywords
-           editable = bug.check_can_change_field("keywords", 0, 1),
-           no_tds = 1, possible_values = all_keywords
+          bug = bug, field = bug_fields.keywords, value = bug.keywords
+          editable = bug.check_can_change_field("keywords", 0, 1),
+          desc_url = "describekeywords.cgi", possible_values = all_keywords
         %]
-      </td>
     </tr>
   [% END %]