diff --git a/jellydoc/src/plugin-resources/maven-jellydoc-plugin.jelly b/jellydoc/src/plugin-resources/maven-jellydoc-plugin.jelly
index 4bb46a64..c33d611a 100644
--- a/jellydoc/src/plugin-resources/maven-jellydoc-plugin.jelly
+++ b/jellydoc/src/plugin-resources/maven-jellydoc-plugin.jelly
@@ -51,8 +51,8 @@
         [<a href="#Tags">tags</a>]
       </p>
       <p>
-        The following document contains a summary of all the core 
-        <a href="http://jakarta.apache.org/commons/jelly/">Jelly</a> tag libraries.  
+        The following document contains a summary of all the
+        <a href="http://jakarta.apache.org/commons/jelly/">Jelly</a> tag libraries.
       </p>
       
     </section>
@@ -68,7 +68,7 @@
       <th>Library</th>
       <th>Description</th>
     </tr>
-    <x:forEach select="$libraries">
+    <x:forEach select="$libraries" sort="@uri">
     <x:set var="uri" select="string(@uri)"/>
     <tr>
       <td><a href="#${uri}">${uri}</a></td>
@@ -80,7 +80,7 @@
     </table>
 
     
-    <x:forEach select="$libraries">
+    <x:forEach select="$libraries" sort="@uri">
     <x:set var="name" select="string(@uri)"/>
     <x:set var="prefix" select="string(@prefix)"/>
   
@@ -95,7 +95,7 @@
       <th>Description</th>
     </tr>
     
-    <x:forEach select="tag">
+    <x:forEach select="tag" sort="@name">
     <x:set var="tagName" select="string(@name)"/>
     <x:set var="doc" select="doc"/>
   <tr>
@@ -120,9 +120,9 @@
         [<a href="#Tags">tags</a>]
       </p>
     
-    <x:forEach select="$libraries">
+    <x:forEach select="$libraries" sort="@uri">
     <x:set var="prefix" select="string(@prefix)"/>
-      <x:forEach select="tag" var="tag">
+      <x:forEach select="tag" var="tag" sort="@name">
       <x:set var="tagName" select="string(@name)"/>
 
       <subsection name="${prefix}:${tagName}">
@@ -137,7 +137,7 @@
         <th>Description</th>
       </tr>
       
-      <x:forEach var="attr" select="$tag/attribute">
+      <x:forEach var="attr" select="$tag/attribute" sort="@name">
     <tr>
         <td><x:expr select="$attr/@name"/></td>
         <td><x:expr select="$attr/@type"/></td>
diff --git a/jellydoc/xdocs/changes.xml b/jellydoc/xdocs/changes.xml
index 3ca901d2..af5f788e 100644
--- a/jellydoc/xdocs/changes.xml
+++ b/jellydoc/xdocs/changes.xml
@@ -9,6 +9,9 @@
   <body>
 
     <release version="1.1" date="In CVS">
+      <action dev="dion" type="update">
+        Sort tag libraries, tags and attributes accordingly
+      </action>
       <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
       <action dev="dion" type="update">
         Upgrade to dom4j 1.4