diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 153d72f277aa4aade05c4da6825786d65082cdf9..bb8cf0834e5ffc3eeb9643184b75d8524b66b75c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="net.i2p.android.router"
-      android.versionCode="4720660"
-      android.versionName="0.9.1-1_b5-API8"
+      android.versionCode="4720656"
+      android.versionName="0.9.1-1_b1-API8"
       android:installLocation="preferExternal"
       >
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/custom_rules.xml b/custom_rules.xml
index 433424ace0925fb7d12289f65222bffa1c0e140e..b8688993a289e5805146c61b123ffcbd671b77ba 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -367,10 +367,12 @@
     <!-- overrides of those in main_rules.xml -->
 
     <target name="-pre-build" depends="copy-i2p-resources" >
-        <!-- aapt messes up when resources are added or deleted, just build every time -->
+        <!-- aapt messes up when resources are added or deleted, just build every time
         <delete dir="${gen.absolute.dir}/net" verbose="${verbose}" />
-        <!-- screw it, do the classes too, until I add the depend class -->
+         -->
+        <!-- screw it, do the classes too, until I add the depend class
         <delete dir="${out.absolute.dir}/classes/net" verbose="${verbose}" />
+        -->
     </target>
 
 <!--
diff --git a/routerjars/AndroidManifest.xml b/routerjars/AndroidManifest.xml
index fddc48250838f900343db6cd5878950c5cee54b3..16dfe047a804386242eb6313574159ca8fb51c6f 100644
--- a/routerjars/AndroidManifest.xml
+++ b/routerjars/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="net.i2p.android.router"
-      android.versionCode="4720660"
-      android.versionName="0.9.1-1_b5-API8"
+      android.versionCode="4720656"
+      android.versionName="0.9.1-1_b1-API8"
       android:installLocation="preferExternal"
       >
 
diff --git a/routerjars/custom_rules.xml b/routerjars/custom_rules.xml
index c3ea797505a61ef1d6488c2d476800f87f3b3e6f..0c7993152bb1d549498aa0c36f0f7f3c89ecffe2 100644
--- a/routerjars/custom_rules.xml
+++ b/routerjars/custom_rules.xml
@@ -4,8 +4,8 @@
     <!-- override with i2psrc=path/to/source in local.properties -->
     <property name="i2psrc" value="../../i2p.i2p" />
     <property name="i2pbase" location="${i2psrc}" />
-    <available file="${i2psrc}" property="i2p.present" />
-    <fail message="I2P source directory ${i2psrc} was not found. Install it there or set i2psrc=/path/to/source in local.properties" >
+    <available file="${i2pbase}" property="i2p.present" />
+    <fail message="I2P source directory ${i2pbase} was not found. Install it there or set i2psrc=/path/to/source in local.properties" >
         <condition>
             <not>
                 <isset property="i2p.present" />
@@ -22,8 +22,8 @@
 
     <target name="-pre-compile" depends="jbigi, buildrouter" />
 
-    <!-- 
-         Creates the output directories if they don't exist yet. 
+    <!--
+         Creates the output directories if they don't exist yet.
     -->
     <target name="-dirs">
         <echo>Creating output directories if needed...</echo>
@@ -37,7 +37,7 @@
 
     <target name="buildrouter" depends="-dirs" >
         <!-- build router and core -->
-        <ant dir="${i2pbase}" >
+        <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" >
             <target name="buildRouter" />
             <target name="buildI2PTunnel" />
             <target name="buildAddressbook" />
@@ -48,7 +48,7 @@
         <copy file="${i2pbase}/build/router.jar" todir="${jar.libs.dir}" />
 
         <!-- bob -->
-        <copy file="${i2pbase}/build/BOB.jar" todir="${jar.libs.dir}" />
+        <copy file="${i2pbase}/apps/BOB/dist/BOB.jar" todir="${jar.libs.dir}" />
         <!-- core -->
 
         <!-- lots of unneeded stuff could be deleted here -->