diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 44854b237fa..b6d95c99488 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -980,6 +980,7 @@ if ($dotweak) {
     my @enterable_products = GetEnterableProducts();
     $vars->{'products'} = \@enterable_products;
     $vars->{'platforms'} = \@::legal_platform;
+    $vars->{'op_sys'} = \@::legal_opsys;
     $vars->{'priorities'} = \@::legal_priority;
     $vars->{'severities'} = \@::legal_severity;
     $vars->{'resolutions'} = \@::settable_resolution;
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
index 096c0e695cf..9ce3a3e300c 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
@@ -67,14 +67,10 @@
   </tr>
   <tr>
 
-    <th>
-      <label for="rep_platform">
-        <a href="page.cgi?id=fields.html#rep_platform">Platform</a>:
-      </label>
-    </th>
+    <th><label for="component">Component:</label></th>
     <td>
-      [% PROCESS selectmenu menuname = "rep_platform"
-                            menuitems = platforms %]
+      [% PROCESS selectmenu menuname = "component"
+                            menuitems = components %]
     </td>
 
     <th>
@@ -90,10 +86,14 @@
   </tr>
   <tr>
 
-    <th><label for="component">Component:</label></th>
+    <th>
+      <label for="rep_platform">
+        <a href="page.cgi?id=fields.html#rep_platform">Platform</a>:
+      </label>
+    </th>
     <td>
-      [% PROCESS selectmenu menuname = "component"
-                            menuitems = components %]
+      [% PROCESS selectmenu menuname = "rep_platform"
+                            menuitems = platforms %]
     </td>
 
     <th>
@@ -108,15 +108,25 @@
 
   </tr>
 
-  [% IF Param("usetargetmilestone") %]
-    <tr>
+  <tr>
+    <th>
+      <label for="op_sys">
+        <a href="page.cgi?id=fields.html#op_sys">OS</a>:
+      </label>
+    </th>
+    <td [% " colspan=\"3\"" IF !Param("usetargetmilestone") %]>
+      [% PROCESS selectmenu menuname = "op_sys"
+                            menuitems = op_sys %]
+    </td>
+
+    [% IF Param("usetargetmilestone") %]
       <th><label for="target_milestone">Target Milestone:</label></th>
-      <td colspan="3">
+      <td>
         [% PROCESS selectmenu menuname = "target_milestone"
                               menuitems = targetmilestones %]
       </td>
-    </tr>
-  [% END %]
+    [% END %]
+  </tr>
 
   [% IF UserInGroup(Param("timetrackinggroup")) %]
     <tr>