diff --git a/apps/BOB/build.xml b/apps/BOB/build.xml
index 69e48bdb3..ee13eafc8 100644
--- a/apps/BOB/build.xml
+++ b/apps/BOB/build.xml
@@ -72,18 +72,43 @@
 
     -->
     <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build BOB into a SINGLE JAR." name="onejar">
-        <jar jarfile="dist/BOB-one.jar">
+	<!-- Make needed working dirs -->
+	<mkdir dir="${dist.dir}/lib" />
+	<mkdir dir="${dist.dir}/classes" />
+
+	<!-- Copy jars -->
+	<copy todir="${dist.dir}/lib" flatten="true" >
+	    <path>
+	        <pathelement path="${javac.classpath}" />
+	    </path>
+	</copy>
+	<copy todir="${dist.dir}/lib" file="../../installer/lib/jbigi/jbigi.jar" />
+
+	<!-- Extract the classes inside the jar files -->
+	<unjar dest="${dist.dir}/classes" >
+            <fileset dir="${dist.dir}/lib" >
+                <include name="**/*.jar" />
+            </fileset>
+        </unjar>
+
+        <!-- Recombine the classes into a new jar file -->
+	<jar jarfile="${dist.dir}/lib/all-in-one.jar" >
+	    <fileset dir="${dist.dir}/classes" />
+        </jar>
+
+        <!-- Clean up work area -->        
+        <delete dir="${dist.dir}/classes" followsymlinks="false" includeemptydirs="true"/>
+
+        <!-- Make the single jar file -->
+        <jar jarfile="dist/BOB-one.jar" >
             <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-            <zipfileset src="dist/lib/i2p.jar" excludes="META-INF/*"/>
-            <zipfileset src="dist/lib/i2ptunnel.jar" excludes="META-INF/*"/>
-            <zipfileset src="dist/lib/mstreaming.jar" excludes="META-INF/*"/>
-            <zipfileset src="dist/lib/router.jar" excludes="META-INF/*"/>
-            <zipfileset src="dist/lib/streaming.jar" excludes="META-INF/*"/>
-            <zipfileset src="dist/lib/wrapper.jar" excludes="META-INF/*"/>
-            <zipfileset src="../../installer/lib/jbigi/jbigi.jar" excludes="META-INF/*"/>
+            <zipfileset src="${dist.dir}/lib/all-in-one.jar" excludes="**/META-INF/*" />
             <manifest>
-                <attribute name="Main-Class" value="net.i2p.BOB.Main"/>
+                <attribute name="Main-Class" value="net.i2p.BOB.Main" />
             </manifest>
         </jar>
+
+        <!-- Clean up the fake jar file -->
+        <delete file="${dist.dir}/lib/all-in-one.jar" />
     </target>
 </project>
diff --git a/build.xml b/build.xml
index 03e894783..ff1b7ff73 100644
--- a/build.xml
+++ b/build.xml
@@ -211,10 +211,51 @@
         <ant dir="apps/systray/java/" target="distclean" />
         <ant dir="apps/i2psnark/java/" target="distclean" />
         <ant dir="apps/jetty/" target="distclean" />
+	<!-- 
+		NOTE! We need to turn off the default excludes for these
+		patterns to work. 
+		These are the defaultexcludes in Ant as seen on
+		http://ant.apache.org/manual/CoreTasks/defaultexcludes.html
+		     **/*~
+                     **/#*#
+                     **/.#*
+                     **/%*%
+                     **/._*
+                     **/CVS
+                     **/CVS/**
+                     **/.cvsignore
+                     **/SCCS
+                     **/SCCS/**
+                     **/vssver.scc
+                     **/.svn
+                     **/.svn/**
+                     **/.DS_Store
+		The only recourse is to remove the offending ones.
+		We do this here, as we only need one change, and then put it
+		back after we are done with it.
+	-->
+	<defaultexcludes remove="**/*~"/>
+
         <delete>
             <fileset dir="." includes="**/*.class" />
             <fileset dir="." includes="**/*.java~" />
+	    <!-- 
+	    	Less common, but they pollute my workspace here, so we
+            	might as well nuke these as well. Are there any others?
+            	
+            	!!??? Why don't we just nuke "**/*~" ???!!
+
+            	++Sponge
+            -->
+            <fileset dir="." includes="**/*.txt~" />
+            <fileset dir="." includes="**/*.xml~"  />
+            <fileset dir="." includes="**/*.sh~"  />
+            <fileset dir="." includes="**/*.SlackBuild~" />
         </delete>
+	<!--
+		Now we put the defaults back
+	-->
+	<defaultexcludes default="true"/>
     </target>
     <target name="pkg" depends="distclean, updater, preppkg, installer" />
     <target name="pkgclean" depends="deletepkg-temp">
diff --git a/history.txt b/history.txt
index 064ce2c62..8f0808d4e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2010-01-02 sponge
+    * Fix build.xml target for justBOB
+    * Fix Main build.xml so that it actually deletes backup files and add a
+      few extra types that should be commonly needed... atleast by me.
+
 2010-01-02 zzz
     * Console: Save refresh setting
     * i2psnark: