diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java b/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
index 88cb03d8bd..40db697534 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/providers/AttachmentProvider.java
@@ -99,7 +99,7 @@ public interface AttachmentProvider extends WikiProvider {
      *  
      *  @param page The parent page
      *  @param name The name of the attachment
-     *  @param version The version of the attachment (it's okay to use WikiPage.LATEST_VERSION to find the latest one)
+     *  @param version The version of the attachment (it's okay to use {@link WikiProvider#.LATEST_VERSION} to find the latest one)
      *  @return An attachment object
      *  @throws ProviderException If the attachment cannot be found or some other error occurs.
      */
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
index 0cf75e574b..198adfd766 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
@@ -48,6 +48,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -126,6 +128,13 @@ public void service( final HttpServletRequest req,
                     if (locale == null) {
                         locale = Locale.getDefault();
                     }
+                    final Locale sorter = locale;
+                    Collections.sort(plugins, new Comparator<Plugin>() {
+                        @Override
+                        public int compare(Plugin o1, Plugin o2) {
+                            return o1.getDisplayName(sorter).compareTo(o2.getDisplayName(sorter));
+                        }
+                    });
                     for (Plugin p : plugins) {
                         try {
                             SimpleSnipData data = new SimpleSnipData();
diff --git a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml
index 3ef2883c25..4b319f6df6 100644
--- a/jspwiki-main/src/main/resources/ini/jspwiki_module.xml
+++ b/jspwiki-main/src/main/resources/ini/jspwiki_module.xml
@@ -145,7 +145,34 @@
         <author>ASF</author>
         <minVersion>2.4</minVersion>
     </plugin>
-
+    <plugin class="org.apache.wiki.forms.FormClose">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
+     <plugin class="org.apache.wiki.forms.FormOpen">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
+    <plugin class="org.apache.wiki.forms.FormInput">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
+    <plugin class="org.apache.wiki.forms.FormOutput">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
+    <plugin class="org.apache.wiki.forms.FormSelect">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
+    <plugin class="org.apache.wiki.forms.FormTextarea">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
+    <plugin class="org.apache.wiki.forms.FormSet">
+        <author>ASF</author>
+        <minVersion>2.6</minVersion>
+    </plugin>
     <filter class="org.apache.wiki.filters.SpamFilter">
         <author>Janne Jalkanen</author>
         <minVersion>2.6</minVersion>
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
index ebbc575a08..f13a6a087a 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/ui/admin/beans/PluginBeanTest.java
@@ -39,37 +39,40 @@ public void testDoGet() throws WikiException, NotCompliantMBeanException {
         testEngine = new TestEngine(props);
         final Context context = Wiki.context().create(testEngine, Wiki.contents().page(testEngine, "TestPage01"));
         final PluginBean pb = new PluginBean(testEngine);
-        final String expectedHtml = 
-                "<div>"
-                + "<h4>Plugins</h4>"
-                + "<table border=\"1\">"
-                    + "<tr><th>Name</th><th>Alias</th><th>Author</th><th>Notes</th></tr>"
-                    + "<tr><td>Counter</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>CurrentTimePlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>Denounce</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>Groups</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>IfPlugin</td><td>If</td><td>Janne Jalkanen</td><td></td></tr>"
-                    + "<tr><td>Image</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>IndexPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>InsertPage</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>ListLocksPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>Note</td><td></td><td>Janne Jalkanen</td><td></td></tr>"
-                    + "<tr><td>PageViewPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>RecentChangesPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>ReferredPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>ReferringPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>ReferringUndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>SamplePlugin</td><td>samplealias</td><td>Janne Jalkanen</td><td></td></tr>"
-                    + "<tr><td>SamplePlugin2</td><td>samplealias2</td><td>Janne Jalkanen</td><td></td></tr>"
-                    + "<tr><td>Search</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>TableOfContents</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>UndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>UnusedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>WeblogArchivePlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>WeblogEntryPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                    + "<tr><td>WeblogPlugin</td><td></td><td>ASF</td><td></td></tr>"
-                + "</table>"
-                + "</div>";
+        final String expectedHtml
+                = "<div><h4>Plugins</h4><table border=\"1\">"
+                + "<tr><th>Name</th><th>Alias</th><th>Author</th><th>Notes</th></tr>"
+                + "<tr><td>Counter</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>CurrentTimePlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>Denounce</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormClose</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormInput</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormOpen</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormOutput</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormSelect</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormSet</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>FormTextarea</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>Groups</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>IfPlugin</td><td>If</td><td>Janne Jalkanen</td><td></td></tr>"
+                + "<tr><td>Image</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>IndexPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>InsertPage</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>ListLocksPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>Note</td><td></td><td>Janne Jalkanen</td><td></td></tr>"
+                + "<tr><td>PageViewPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>RecentChangesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>ReferredPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>ReferringPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>ReferringUndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>SamplePlugin</td><td>samplealias</td><td>Janne Jalkanen</td><td></td></tr>"
+                + "<tr><td>SamplePlugin2</td><td>samplealias2</td><td>Janne Jalkanen</td><td></td></tr>"
+                + "<tr><td>Search</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>TableOfContents</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>UndefinedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>UnusedPagesPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>WeblogArchivePlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>WeblogEntryPlugin</td><td></td><td>ASF</td><td></td></tr>"
+                + "<tr><td>WeblogPlugin</td><td></td><td>ASF</td><td></td></tr></table></div>";
         Assertions.assertEquals(expectedHtml, pb.doGet(context));
     }