Index: pom.xml
===================================================================
--- pom.xml	(revision 18278)
+++ pom.xml	(working copy)
@@ -218,6 +218,57 @@
         </configuration>
       </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <!-- generate TLDs : -->
+        <plugin>
+          <groupId>org.codehaus.xdoclet</groupId>
+          <artifactId>maven2-xdoclet2-plugin</artifactId>
+          <version>2.0.7-SNAPSHOT</version>
+          <executions>
+            <execution>
+              <id>xdoclet</id>
+              <phase>generate-sources</phase>
+              <goals>
+                <goal>xdoclet</goal>
+              </goals>
+            </execution>
+          </executions>
+          <dependencies>
+            <dependency>
+              <groupId>org.codehaus.xdoclet</groupId>
+              <artifactId>xdoclet-plugin-web</artifactId>
+              <version>1.0.5-SNAPSHOT</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <sourceArtifacts>info.magnolia:magnolia-taglib-*</sourceArtifacts>
+            <configs>
+              <config>
+                <components>
+                  <component>
+                    <classname>org.xdoclet.plugin.web.TaglibPlugin</classname>
+                    <params>
+                      <!-- let's only generate for sources here, not the dependencies : -->
+                      <restrictedpath>file://${settings.localRepository}</restrictedpath>
+                      <validate>false</validate>
+                      <jspversion>2.0</jspversion>
+                      <!-- this will only work if we don't validate: -->
+                      <taglibversion>${project.version}</taglibversion>
+                      <shortname>${taglib.shortname}</shortname>
+                      <uri>${taglib.uri}</uri>
+                      <displayname>${project.name}</displayname>
+                      <description>${project.description}</description>
+                    </params>
+                  </component>
+                </components>
+                <includes>**/*.java</includes>
+              </config>
+            </configs>
+          </configuration>
+        </plugin>        
+      </plugins>
+    </pluginManagement>
   </build>
   <dependencyManagement>
     <dependencies>
@@ -570,7 +621,23 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>codehaus-snapshots</id>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <url>http://snapshots.repository.codehaus.org</url>
+    </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>codehaus-snapshots</id>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <url>http://snapshots.repository.codehaus.org</url>
+    </pluginRepository>
+  </pluginRepositories>
   <modules>
     <module>magnolia-core</module>
     <module>magnolia-jaas</module>
Index: magnolia-taglib-cms/pom.xml
===================================================================
--- magnolia-taglib-cms/pom.xml	(revision 18342)
+++ magnolia-taglib-cms/pom.xml	(working copy)
@@ -7,7 +7,12 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>magnolia-taglib-cms</artifactId>
-  <name>magnolia-taglib-cms</name>
+  <name>CMS Tag Library</name>
+  <description>Core tag library for CMS</description>
+  <properties>
+    <taglib.shortname>cms</taglib.shortname>
+    <taglib.uri>cms-taglib</taglib.uri>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>info.magnolia</groupId>
@@ -57,6 +62,14 @@
        <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.xdoclet</groupId>
+        <artifactId>maven2-xdoclet2-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <plugins>
       <plugin>
Index: magnolia-taglib-utility/pom.xml
===================================================================
--- magnolia-taglib-utility/pom.xml	(revision 18278)
+++ magnolia-taglib-utility/pom.xml	(working copy)
@@ -8,7 +8,12 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>magnolia-taglib-utility</artifactId>
-  <name>magnolia-taglib-utility</name>
+  <name>CMS Utility Tag Library</name>
+  <description>CMS Utility Tag Library</description>
+  <properties>
+    <taglib.shortname>cmsu</taglib.shortname>
+    <taglib.uri>cms-util-taglib</taglib.uri>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>info.magnolia</groupId>
@@ -58,6 +63,14 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.xdoclet</groupId>
+        <artifactId>maven2-xdoclet2-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <plugins>
       <plugin>