diff --git a/apps/fortuna/build.xml b/apps/fortuna/build.xml
new file mode 100644
index 000000000..50fdf2465
--- /dev/null
+++ b/apps/fortuna/build.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="all" name="fortuna">
+
+	<property name="cvs.base.dir" value="java/gnu-crypto" />
+	<property name="cvs.etc.dir" value="${cvs.base.dir}/etc" />
+	<property name="cvs.lib.dir" value="${cvs.base.dir}/lib" />
+	<property name="cvs.object.dir" value="${cvs.base.dir}/classes" />
+	<property name="cvs.base.crypto.object.dir" value="${cvs.object.dir}/gnu/crypto" />
+	<property name="cvs.cipher.object.dir" value="${cvs.base.crypto.object.dir}/cipher" />
+	<property name="cvs.hash.object.dir" value="${cvs.base.crypto.object.dir}/hash" />
+	<property name="cvs.prng.object.dir" value="${cvs.base.crypto.object.dir}/prng" />
+
+	<patternset id="fortuna.files">
+		<include name="${cvs.base.crypto.object.dir}/Registry.class"/>
+		<include name="${cvs.prng.object.dir}/Fortuna*.class"/>
+		<include name="${cvs.prng.object.dir}/BasePRNG.class"/>
+		<include name="${cvs.prng.object.dir}/RandomEventListener.class"/>
+		<include name="${cvs.prng.object.dir}/IRandom.class"/>
+		<include name="${cvs.cipher.object.dir}/CipherFactory.class"/>
+		<include name="${cvs.cipher.object.dir}/IBlockCipher.class"/>
+		<include name="${cvs.hash.object.dir}/HashFactory.class"/>
+		<include name="${cvs.hash.object.dir}/IMessageDigest.class"/>
+	</patternset>
+
+	<target name="all" depends="build,jar" 
+		description="Create and test the custom Fortuna library" />
+
+	<target name="build" depends="-init,checkout"
+		description="Build the source and tests">
+		<ant dir="${cvs.base.dir}" target="jar" />
+	</target>
+
+	<target name="builddep" />
+
+	<target name="checkout" depends="-init" unless="cvs.source.available"
+		description="Check out GNU Crypto sources from CVS HEAD">
+		<cvs cvsRoot=":ext:anoncvs@savannah.gnu.org:/cvsroot/gnu-crypto"
+			cvsRsh="ssh"
+			dest="java"
+			package="gnu-crypto" />
+	</target>
+
+	<target name="clean"
+		description="Remove generated tests and object files">
+		<ant dir="${cvs.base.dir}" target="clean" />
+	</target>
+
+	<target name="cleandep" />
+
+	<target name="compile" />
+
+	<target name="distclean" depends="clean"
+		description="Remove all generated files">
+		<delete dir="build" />
+		<delete dir="jartemp" />
+		<!--
+			Annoyingly the GNU Crypto distclean task called here doesn't clean
+			*all* derived files from java/gnu-crypto/lib like it should.....
+		-->
+		<ant dir="${cvs.base.dir}" target="distclean" />
+		<!--
+			.....and so we mop up the rest ourselves.
+		-->
+		<delete dir="${cvs.lib.dir}" />
+	</target>
+
+	<target name="-init">
+		<available property="cvs.source.available" file="${cvs.base.dir}" />
+	</target>
+
+	<target name="jar" depends="build"
+		description="Create the custom Fortuna jar library">
+		<delete dir="build" />
+		<delete dir="jartemp" />
+		<mkdir dir="build" />
+		<mkdir dir="jartemp/${cvs.object.dir}" />
+		<copy todir="jartemp">
+			<fileset dir=".">
+				<patternset refid="fortuna.files" />
+			</fileset>
+		</copy>
+		<jar basedir="jartemp/${cvs.object.dir}" jarfile="build/fortuna.jar">
+			<manifest>
+				<section name="fortuna">
+					<attribute name="Implementation-Title" value="I2P Custom GNU Crypto Fortuna Library" />
+					<attribute name="Implementation-Version" value="CVS HEAD" /> 
+					<attribute name="Implementation-Vendor" value="Free Software Foundation" />
+					<attribute name="Implementation-Vendor-Id" value="FSF" />
+					<attribute name="Implementation-URL" value="http://www.gnu.org/software/gnu-crypto" />
+				</section>
+			</manifest>
+		</jar>
+		<delete dir="jartemp" />
+	</target>
+
+	<target name="test" depends="jar"
+		description="Perform crypto tests on custom Fortuna jar library" />
+		<!--
+			Add this when Fortuna tests are added to GNU Crypto, else write some
+		-->
+
+	<target name="update" depends="checkout"
+		description="Update GNU Crypto sources to latest CVS HEAD">
+		<cvs command="update -d" cvsRsh="ssh" dest="java/gnu-crypto" />
+	</target>
+</project>
diff --git a/build.xml b/build.xml
index e22564690..77575c2af 100644
--- a/build.xml
+++ b/build.xml
@@ -213,10 +213,10 @@
         <copy file="hosts.txt" todir="pkg-temp/" />
         <copy file="install-headless.txt" todir="pkg-temp/" />
         <copy file="history.txt" todir="pkg-temp/" />
-    	<mkdir dir="pkg-temp/scripts" />
-    	<copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
-    	<copy file="core/perl/i2pbench.sh" todir="pkg-temp/scripts/" />
-    	<copy file="core/perl/i2ptest.sh" todir="pkg-temp/scripts/" />
+        <mkdir dir="pkg-temp/scripts" />
+        <copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
+        <copy file="core/perl/i2pbench.sh" todir="pkg-temp/scripts/" />
+        <copy file="core/perl/i2ptest.sh" todir="pkg-temp/scripts/" />
         <mkdir dir="pkg-temp/docs" />
         <copy file="readme.html" todir="pkg-temp/docs/" />
         <copy file="installer/resources/startconsole.html" todir="pkg-temp/docs/" />
diff --git a/core/perl/i2ptest.sh b/core/perl/i2ptest.sh
index a9e565412..9b5229f35 100644
--- a/core/perl/i2ptest.sh
+++ b/core/perl/i2ptest.sh
@@ -3,8 +3,6 @@
 # Use the "--sourcedir" parameter if running this from the source tree.
 # Yeah yeah, a lot of repetitive code here, but it works for now.
 
-#i2p/apps/proxyscript/i2pProxy.pac
-
 $runtime = "java";
 $classpath = "../lib/i2p.jar:../lib/jbigi.jar";
 
diff --git a/history.txt b/history.txt
index 6b500988f..540bec85e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.135 2005/01/26 19:21:10 smeghead Exp $
+$Id: history.txt,v 1.136 2005/01/26 23:48:41 smeghead Exp $
+
+2005-02-03  smeghead
+    * Added Ant buildfile in apps/fortuna for creating a custom Fortuna PRNG jar
+      library from GNU Crypto's CVS HEAD sources.
 
 2005-01-26  smeghead
     * i2pProxy.pac, i2pbench.sh, and i2ptest.sh are now shipped with the dist