diff --git a/google-taglib/.cvsignore b/google-taglib/.cvsignore
index c92873e..ec05815 100644
--- a/google-taglib/.cvsignore
+++ b/google-taglib/.cvsignore
@@ -1,6 +1,7 @@
 build
 dist
 javadoc
+tlddoc
 *.bat
 key.txt
 ChangeLog
\ No newline at end of file
diff --git a/google-taglib/build.properties b/google-taglib/build.properties
index ae81e9c..ea86013 100644
--- a/google-taglib/build.properties
+++ b/google-taglib/build.properties
@@ -19,6 +19,10 @@ javadoc.dir=javadoc
 javadoc.title=Google Tag Library
 javadoc.packages=net.thauvin.google.*
 
+# TLDDoc
+tlddoc.dir=tlddoc
+
 # Docs
+doc.dir=htdocs
 doc.license=LICENSE.txt
 doc.readme=README.txt
\ No newline at end of file
diff --git a/google-taglib/build.xml b/google-taglib/build.xml
index c497ff0..0aa066a 100644
--- a/google-taglib/build.xml
+++ b/google-taglib/build.xml
@@ -27,6 +27,7 @@
 		<mkdir dir="${build.dir}"/>
 		<mkdir dir="${dist.dir}"/>
 		<mkdir dir="${javadoc.dir}"/>
+		<mkdir dir="${tlddoc.dir}"/>
 	</target>
 	<!-- Compile target -->
 	<target name="compile" depends="prepare" description="Compiles sources">
@@ -44,28 +45,33 @@
 			</fileset>
 		</jar>
 	</target>
+	<!-- TLD target -->
+	<target name="tld" description="Builds the TLD">
+		<!-- Copy the TLD -->
+		<filter token="version" value="${version}"/>
+		<copy file="${tlds.dir}/${project.name}.tld" todir="${dist.dir}" filtering="true"/>
+	</target>
 	<!-- WAR target -->
-	<target name="war" depends="jar" description="Builds the WAR">
+	<target name="war" depends="jar,tld" description="Builds the WAR">
 		<!-- Copy the WAR dir -->
 		<copy todir="${build.war}">
 			<fileset dir="${war.dir}"/>
 		</copy>
 		<!-- Copy the TLD -->
-		<filter token="version" value="${version}"/>
-		<copy file="${tlds.dir}/${project.name}.tld" todir="${build.war}/WEB-INF" filtering="true"/>
+		<copy file="${dist.dir}/${project.name}.tld" todir="${build.war}/WEB-INF"/>
 		<!-- Copy the license -->
 		<copy file="${licenses.dir}/${doc.license}" todir="${build.war}"/>
 		<!-- Copy the JAR -->
 		<copy file="${dist.dir}/${project.name}.jar" todir="${build.war}/WEB-INF/lib/"/>
 		<!-- Freeze the mod dates -->
 		<touch>
-    		<fileset dir="${build.war}"/>
-    	</touch>
+			<fileset dir="${build.war}"/>
+		</touch>
 		<!-- Create the web archive -->
 		<jar jarfile="${dist.dir}/${war.dir}-${version}.war" basedir="${build.war}"/>
 	</target>
 	<!-- Release target -->
-	<target name="release" depends="jar" description="Builds the release archives">
+	<target name="release" depends="jar,tld" description="Builds the release archives">
 		<mkdir dir="${build.release}"/>
 		<!-- Copy the TLD -->
 		<filter token="version" value="${version}"/>
@@ -78,14 +84,30 @@
 		<copy file="${dist.dir}/${project.name}.jar" todir="${build.release}"/>
 		<!-- Freeze the mod dates -->
 		<touch>
-    		<fileset dir="${build.release}"/>
-    	</touch>
+			<fileset dir="${build.release}"/>
+		</touch>
 		<!-- Create the ZIP archive -->
 		<zip destfile="${dist.dir}/${release.name}.zip" basedir="${build.release}"/>
 		<!-- Create the TAR archive -->
 		<tar tarfile="${dist.dir}/${release.name}.tar.gz" compression="gzip">
-    		<tarfileset dir="${build.release}" prefix="${release.name}" mode="644"/>
-    	</tar>
+			<tarfileset dir="${build.release}" prefix="${release.name}" mode="644"/>
+		</tar>
+	</target>
+	<!-- Src target -->
+	<target name="src" description="Builds the source archive">
+		<!-- Create the TAR archive -->
+		<tar tarfile="${dist.dir}/${release.name}-src.tar.gz" compression="gzip">
+			<tarfileset dir="${basedir}" prefix="${release.name}">
+				<include name="${src.dir}/**"/>
+				<include name="${tlds.dir}/**"/>
+				<include name="${lib.dir}/**"/>
+				<include name="${licenses.dir}/**"/>
+				<include name="${war.dir}/**"/>
+				<include name="${doc.readme}"/>
+				<include name="${doc.dir}/**"/>
+				<include name="build.*"/>
+			</tarfileset>
+		</tar>
 	</target>
 	<!-- Javadoc target -->
 	<target name="javadoc" depends="prepare" description="Builds the Javadoc">
@@ -96,12 +118,21 @@
 			<classpath refid="classpath"/>
 		</javadoc>
 	</target>
+	<!-- TLDDoc target -->
+	<target name="tlddoc" depends="prepare,tld" description="Builds the TLD documentation">
+		<delete quiet="true" includeEmptyDirs="true">
+			<fileset dir="${tlddoc.dir}" includes="*,*/**"/>
+		</delete>
+		<java jar="${lib.dir}/tlddoc.jar" failonerror="true" fork="true">
+			<arg line="-windowtitle &quot;${javadoc.title}&quot; -doctitle &quot;${javadoc.title}&quot; -d ${tlddoc.dir} ${dist.dir}/${project.name}.tld"/>
+		</java>
+	</target>
 	<!-- DocCheck target -->
 	<target name="doccheck" depends="prepare" description="Checks the Javadoc">
 		<delete quiet="true" includeEmptyDirs="true">
 			<fileset dir="${javadoc.dir}" includes="*,*/**"/>
 		</delete>
-		<javadoc sourcepath="${src.dir}" packagenames="${javadoc.packages}" destdir="${javadoc.dir}" verbose="false" failonerror="true" doclet="com.sun.tools.doclets.doccheck.DocCheck" docletpath="${lib.dir}\doccheck.jar">
+		<javadoc sourcepath="${src.dir}" packagenames="${javadoc.packages}" destdir="${javadoc.dir}" verbose="false" failonerror="true" doclet="com.sun.tools.doclets.doccheck.DocCheck" docletpath="${lib.dir}/doccheck.jar">
 			<classpath refid="classpath"/>
 		</javadoc>
 	</target>
diff --git a/google-taglib/htdocs/about.html b/google-taglib/htdocs/about.html
index 0d80ec2..416ad05 100644
--- a/google-taglib/htdocs/about.html
+++ b/google-taglib/htdocs/about.html
@@ -30,6 +30,7 @@ body,td,font,p,a{font-family:arial,sans-serif}
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
 			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
+			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
 			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#cc9900">About</font></b> 
 			</small>
 			</p>
diff --git a/google-taglib/htdocs/docs.html b/google-taglib/htdocs/docs.html
index 8780f4a..a7592ba 100644
--- a/google-taglib/htdocs/docs.html
+++ b/google-taglib/htdocs/docs.html
@@ -32,10 +32,10 @@ code {font-size:10pt}
 			<small><br>
 			&nbsp;&nbsp;<a href="index.html">Overview</a> <br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
-			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">Documentation</font></b>
-			<br>
+			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">Documentation</font></b><br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
 			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
+			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
 			&nbsp;&nbsp;<a href="about.html">About</a> </small>
 			</p>
 			<img width="145" height="0" alt="">
@@ -430,7 +430,7 @@ code {font-size:10pt}
 								<font size="-1"><a name="2_1_site"><b>site</b></a></font>
 							</div>
 						</td>
-						<td><font size="-1">Restricts the search to documents  within the specfied
+						<td><font size="-1">Restricts the search to documents  within the specified
 						site.</font></td>
 						<td>&nbsp;</td>
 					</tr>
diff --git a/google-taglib/htdocs/howto.html b/google-taglib/htdocs/howto.html
index 2947655..a3205eb 100644
--- a/google-taglib/htdocs/howto.html
+++ b/google-taglib/htdocs/howto.html
@@ -32,9 +32,9 @@ body,td,font,.p,a{font-family:arial,sans-serif}
 			&nbsp;&nbsp;<a href="index.html">Overview</a> <br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
-			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">HowTo</font></b>
-			<br>
-			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
+			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">HowTo</font></b><br>
+			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a><br>
+			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
 			&nbsp;&nbsp;<a href="about.html">About</a> </small>
 			</p>
 			<img alt="" width="143" height="0">
diff --git a/google-taglib/htdocs/index.html b/google-taglib/htdocs/index.html
index 4af3e52..ec419cb 100644
--- a/google-taglib/htdocs/index.html
+++ b/google-taglib/htdocs/index.html
@@ -29,7 +29,8 @@ body,td,font,p,a{font-family:arial,sans-serif}
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
-			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
+			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a><br>
+			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
 			&nbsp;&nbsp;<a href="about.html">About</a> </small>
 			</p>
 			<img alt="" width="143" height="0">
diff --git a/google-taglib/htdocs/license.html b/google-taglib/htdocs/license.html
index 64a9539..057c5e4 100644
--- a/google-taglib/htdocs/license.html
+++ b/google-taglib/htdocs/license.html
@@ -29,6 +29,7 @@ body,td,font,p,a{font-family:arial,sans-serif}
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
 			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
+			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
 			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#cc9900">About</font></b>
 			</small>
 			</p>
diff --git a/google-taglib/lib/tlddoc.jar b/google-taglib/lib/tlddoc.jar
new file mode 100644
index 0000000..b82f56d
Binary files /dev/null and b/google-taglib/lib/tlddoc.jar differ
diff --git a/google-taglib/tlds/google.tld b/google-taglib/tlds/google.tld
index 68b0b49..723a22b 100644
--- a/google-taglib/tlds/google.tld
+++ b/google-taglib/tlds/google.tld
@@ -11,9 +11,7 @@
 	<!-- Public URI that uniquely identifies this version of the tag library -->
 	<uri>http://www.thauvin.net/taglibs/google-taglib-@version@</uri>
 	<!-- General information about this tag library -->
-	<info>
-		The Google Tag Library.
-	</info>
+	<info>The Google Tag Library.</info>
 	<!-- CachedPage Tag -->
 	<tag>
 		<name>cachedPage</name>
@@ -22,6 +20,7 @@
 		<info>Displays a page cached by Google.</info>
 		<attribute>
 			<name>key</name>
+			<info>Specifies the authentication key.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
@@ -34,21 +33,25 @@
 		<info>Displays the given property of the current search result element.</info>
 		<attribute>
 			<name>css</name>
+			<info>Specifies the HTML link's class attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>name</name>
+			<info>Specifies the desired property of the current result set item.</info>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>style</name>
+			<info>Specifies the HTML link's style attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>target</name>
+			<info>Specifies the HTML link's target attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
@@ -75,16 +78,19 @@
 		<info>Displays a link to the next search result set.</info>
 		<attribute>
 			<name>css</name>
+			<info>Specifies the HTML link's class attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>style</name>
+			<info>Specifies the HTML link's style attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>target</name>
+			<info>Specifies the HTML link's target attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
@@ -97,16 +103,19 @@
 		<info>Displays a link to the previous search result set.</info>
 		<attribute>
 			<name>css</name>
+			<info>Specifies the HTML link's class attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>style</name>
+			<info>Specifies the HTML link's style attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>target</name>
+			<info>Specifies the HTML link's target attribute.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
@@ -119,51 +128,61 @@
 		<info>Performs a Google search.</info>
 		<attribute>
 			<name>cache</name>
+			<info>Specifies whether results are cached between search requests.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>filter</name>
+			<info>Activates or deactivates automatic results filtering.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>key</name>
+			<info>Specifies the authentication key.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>lr</name>
+			<info>Restricts the search to documents within one or more languages.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>maxResults</name>
+			<info>Specifies the number of results desired per query.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>restrict</name>
+			<info>Restricts the search to a subset of the Google web index.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>safeSearch</name>
+			<info>Enables filtering of adult content in the search results.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>site</name>
+			<info>Restricts the search to documents within the specified site.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>start</name>
+			<info>Specifies the index of the first desired result.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
 			<name>type</name>
+			<info>Specifies the file type to be searched.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
@@ -183,6 +202,7 @@
 		<info>Displays the current search query.</info>
 	    <attribute>
 			<name>type</name>
+			<info>Specifies whether the search keywords or full query should be returned.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
@@ -216,6 +236,7 @@
 		<info>Performs a Google spelling suggestion.</info>
 		<attribute>
 			<name>key</name>
+			<info>Specifies the authentication key.</info>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>