diff --git a/mozilla/webtools/bugzilla/describecomponents.cgi b/mozilla/webtools/bugzilla/describecomponents.cgi
index bce7577d24a..ad3467d6248 100755
--- a/mozilla/webtools/bugzilla/describecomponents.cgi
+++ b/mozilla/webtools/bugzilla/describecomponents.cgi
@@ -74,7 +74,7 @@ my $colbut1 = $cols - 1;
 
 print "</tr>";
 
-SendSQL("select value, initialowner, initialqacontact, description from components where program = " . SqlQuote($product));
+SendSQL("select value, initialowner, initialqacontact, description from components where program = " . SqlQuote($product) . " order by value");
 
 while (MoreSQLData()) {
     my @row = FetchSQLData();
diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index e1e40670265..94a4f740269 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -222,7 +222,7 @@ sub GenerateVersionTable {
         push @{$::versions{$p1}}, $v;
         $varray{$v} = 1;
     }
-    SendSQL("select value, program from components");
+    SendSQL("select value, program from components order by value");
     while (@line = FetchSQLData()) {
         my ($c,$p) = (@line);
         if (!defined $::components{$p}) {