diff --git a/build.xml b/build.xml
index ffde45f44..092b68808 100644
--- a/build.xml
+++ b/build.xml
@@ -380,7 +380,7 @@
             packagenames="*"
             use="true"
             splitindex="true"
-            doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}"
+            doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
             windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
             <group title="Streaming Library" packages="net.i2p.client.streaming" />
@@ -469,7 +469,12 @@
             <arg value="-f1" />
             <arg value="-d;" />
         </exec>
-        <echo message="Build number is ${build.number}" />
+        <exec executable="awk" outputproperty="build.extra" failonerror="false">
+            <arg value="-F&quot;" />
+            <arg value="/public final static String EXTRA/{print $2}" />
+            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
+        </exec>
+        <echo message="Build number is ${build.number}${build.extra}" />
     </target>
 
     <target name="clean" depends="pkgclean" >
@@ -478,6 +483,9 @@
         <delete file="i2pinstall.exe" failonerror="false" quiet="true" />	
         <delete file="i2p.exe" failonerror="false" quiet="true" />
         <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
+        <delete>
+            <fileset dir="." includes="i2pinstall*jar i2pinstall*bz2" />
+        </delete>
         <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
         <delete file="BOB-one.jar" failonerror="false" quiet="true" />	
 	<delete dir="core/c/jbigi/bin" />
@@ -1041,14 +1049,14 @@
         <mkdir dir="pkg-temp/installer" />
         <!-- set if unset -->
         <property name="workspace.changes.util.tr" value="" />
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-freebsd-only.jar" installerType="standard" basedir="${basedir}" />
+	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
     <target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
         <mkdir dir="pkg-temp/installer" />
         <!-- set if unset -->
         <property name="workspace.changes.util.tr" value="" />
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-linux-only.jar" installerType="standard" basedir="${basedir}" />
+	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
 
@@ -1057,7 +1065,7 @@
 	<mkdir dir="pkg-temp/osx" />
         <!-- set if unset -->
         <property name="workspace.changes.util.tr" value="" />
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-osx-only.jar" installerType="standard" basedir="${basedir}" />
+	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
 	<ant target="installer2app" />
 	<delete dir="pkg-temp/osx" />
     </target>
@@ -1070,21 +1078,21 @@
 	<mkdir dir="pkg-temp/osx" />
 	<exec executable="python" failonerror="true">
 	    <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
-	    <arg value="${basedir}/i2pinstall_${release.number}-osx-only.jar" />
-	    <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app" />
+	    <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
+	    <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
 	</exec>
 	<exec executable="chmod" failonerror="true" osfamily="unix">
 		<arg value="755" />
-		<arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app/Contents/MacOS/JavaApplicationStub" />
+		<arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
 	</exec>
 	<exec executable="tar" osfamily="unix" failonerror="true">
 		<arg value="--owner=root" />
 		<arg value="--group=root" />
 		<arg value="-cjvf" />
-		<arg value="${basedir}/i2pinstall_${release.number}-osx.tar.bz2" />
+		<arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
 		<arg value="-C" />
 		<arg value="${basedir}/pkg-temp/osx" />
-		<arg value="i2p-${release.number}-osx-install.app" />
+		<arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
 	</exec>
     </target>
 
@@ -1119,7 +1127,7 @@
                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
             </manifest>
         </jar>
-	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-windows-only.jar" installerType="standard" basedir="${basedir}" />
+	<izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
 	<delete dir="pkg-temp/win" />
     </target>