diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index b0b3a520f5dfa53d2a18f97f79bbcb1aa6a21a69..caead938c11c566dea4cc3a14fba7459d686e487 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -233,6 +233,7 @@ public abstract class PluginManager extends AbstractModelObject {
                                         stop(); // disable all plugins since classloading from them can lead to StackOverflow
                                         throw e;    // let Hudson fail
                                     }
+                                    Collections.sort(plugins);
                                 }
                             });
 
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index 4f665e4a58d11cf8c14fa5b21f38534c93804a00..b637c3720f9289d40b0e73456bfaddcab19cade1 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -1,7 +1,8 @@
 /*
  * The MIT License
  * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Yahoo! Inc., Erik Ramfelt, Tom Huybrechts
+ * Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi,
+ * Yahoo! Inc., Erik Ramfelt, Tom Huybrechts
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -67,7 +68,7 @@ import org.kohsuke.stapler.HttpResponses;
  *
  * @author Kohsuke Kawaguchi
  */
-public final class PluginWrapper {
+public final class PluginWrapper implements Comparable<PluginWrapper> {
     /**
      * {@link PluginManager} to which this belongs to.
      */
@@ -441,6 +442,13 @@ public final class PluginWrapper {
         return getUpdateInfo()!=null;
     }
 
+    /**
+     * Sort by short name.
+     */
+    public int compareTo(PluginWrapper pw) {
+        return shortName.compareToIgnoreCase(pw.shortName);
+    }
+
 //
 //
 // Action methods
diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly
index 567199f9224887153e786bdb4ba8ba56c1c38c27..bda2d65ab09c78560f781623b924c15e7f980ef6 100644
--- a/core/src/main/resources/hudson/PluginManager/table.jelly
+++ b/core/src/main/resources/hudson/PluginManager/table.jelly
@@ -49,6 +49,12 @@ THE SOFTWARE.
             }
           }
         }
+        function showhideCategory(col) {
+          var row = col.parentNode.nextSibling;
+          var newDisplay = row &amp;&amp; row.style.display == 'none' ? '' : 'none';
+          for (; row &amp;&amp; row.cells.length &gt; 1; row = row.nextSibling)
+            row.style.display = newDisplay;
+        }
       // ]]&gt;
       </script>
       <form method="post" action="install">
@@ -56,7 +62,8 @@ THE SOFTWARE.
         <local:tabBar page="${attrs.page}" xmlns:local="/hudson/PluginManager" />
         <table id="plugins" class="sortable pane bigtable">
             <tr style="border-top: 0px;">
-              <th initialSortDir="${isUpdates?null:'down'}" tooltip="${%Check to install the plugin}"
+              <th initialSortDir="${isUpdates?null:'down'}"
+                  tooltip="${%Check to install the plugin}${isUpdates?'':'&lt;br/&gt;'+'%Click this heading to sort by category'}"
                   width="32" onclick="showhideCategories(this,1)">${%Install}</th>
               <th initialSortDir="${isUpdates?'down':null}"
                   onclick="showhideCategories(this,0)">${%Name}</th>
@@ -72,7 +79,7 @@ THE SOFTWARE.
                     <j:set var="p" value="${p.plugin}" />
                     <j:if test="${thisCat != lastCat}">
                       <tr>
-                        <td class="pane" colspan="3">${thisCat}</td>
+                        <td class="pane" colspan="3" onclick="showhideCategory(this)">${thisCat}</td>
                       </tr>
                     </j:if>
                     <j:set var="lastCat" value="${thisCat}" />
diff --git a/war/resources/css/style.css b/war/resources/css/style.css
index 9aed42b1a2b4ed5526c77890d34b9671d2c61eda..a58267bae8a76ac8b580ed10697e4a10b5cf6704 100644
--- a/war/resources/css/style.css
+++ b/war/resources/css/style.css
@@ -714,8 +714,8 @@ TABLE.fingerprint-in-build TD {
   border-top: none;
 }
 
-#plugins tr:hover {
-  background-color: #eeeee8;
+#pluginsAdv tr:hover {
+  background-color: inherit;
 }
 
 #plugins tr.already-upgraded {