diff --git a/build.bash b/build.bash
index ce793f9..4ca74b3 100755
--- a/build.bash
+++ b/build.bash
@@ -1,12 +1,8 @@
-#!/bin/bash
+#!/bin/bash -e
 
 echo "## Step 00: initialize"
 (
-  if ! [ -d build ]; then
-    mkdir build
-    mkdir build/src
-    mkdir build/src/trunk
-  fi
+  mkdir -p build/src
 )
 
 fetch() {
@@ -15,11 +11,11 @@ fetch() {
   if ! [ -f "${2}/.svn/entries" ]; then
     mkdir "${2}"
     cd "${2}"
-    svn co --non-interactive --trust-server-cert "${1}" "."
+    svn co --non-interactive --trust-server-cert "${1}" -r "${3:-HEAD}" "."
   else
     cd "${2}"
     svn cleanup
-    svn up
+    svn up -r "${3:-HEAD}"
   fi
 )
 }
@@ -60,26 +56,26 @@ buildsrc() {
   echo "## Step 20: creating build/src"
   rm -rf build/src
   mkdir build/src
-  mkdir build/src/trunk
-  copyfolder "src/smack/source/" "build/src/trunk" "."
-  copyfolder "src/qpid/java" "build/src/trunk" "org/apache/qpid/management/common/sasl"
-  copyfolder "src/novell-openldap-jldap" "build/src/trunk" "."
-  copyfolder "src/dnsjava"  "build/src/trunk" "org"
-  copyfolder "src/harmony" "build/src/trunk" "."
-  copyfolder "src/custom" "build/src/trunk" "."
-  copyfolder "src/jbosh" "build/src/trunk" "."
+  copyfolder "src/smack/source/" "build/src" "."
+  copyfolder "src/qpid/java" "build/src" "org/apache/qpid/management/common/sasl"
+  copyfolder "src/novell-openldap-jldap" "build/src" "."
+  copyfolder "src/dnsjava"  "build/src" "org"
+  copyfolder "src/harmony" "build/src" "."
+  copyfolder "src/custom" "build/src" "."
+  copyfolder "src/jbosh" "build/src" "."
+  (cp src/AndroidManifest.xml build/)
 }
 
 patchsrc() {
   echo "## Step 21: patch build/src"
   (
-    cd build/src/trunk/
-    for PATCH in `(cd "../../../${1}" ; find -maxdepth 1 -type f)|sort` ; do
+    cd build/src/
+    for PATCH in `(cd "../../${1}" ; find -maxdepth 1 -type f)|sort` ; do
       if echo $PATCH | grep '\.sh$'; then
-        if [ -f "../../../${1}/$PATCH" ]; then "../../../${1}/$PATCH" || exit 1 ; fi
+        if [ -f "../../${1}/$PATCH" ]; then "../../${1}/$PATCH" || exit 1 ; fi
       fi
       if echo $PATCH | grep '\.patch$'; then
-        if [ -f "../../../${1}/$PATCH" ]; then patch -p0 < "../../../${1}/$PATCH" || exit 1 ; fi
+        if [ -f "../../${1}/$PATCH" ]; then patch -p0 < "../../${1}/$PATCH" || exit 1 ; fi
       fi
     done
   )
diff --git a/build.xml b/build.xml
index 827f4c5..5984b02 100644
--- a/build.xml
+++ b/build.xml
@@ -23,25 +23,24 @@
 <target name="compile-jse"  description="Compile for java se">
     <delete dir="build/classes" failonerror="false" />
     <mkdir dir="build/classes" />
-    <mkdir dir="build/classes/trunk" />
     <javac
       target="1.5"
-      srcdir="build/src/trunk"
-      destdir="build/classes/trunk"
+      srcdir="build/src"
+      destdir="build/classes"
       classpath="lib/xmlpull_1_1_3_4c.jar:lib/httpclient-4.0.jar:lib/httpcore-4.0.1.jar"
       debug="true"
       debuglevel="source,lines"
       excludes="**/de/measite/smack/AndroidDebugger.java"
     />
-    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
+    <copy todir="build/classes"><fileset dir="build/src" includes="META-INF/**" /></copy>
     <jar
-      basedir="build/classes/trunk"
+      basedir="build/classes"
       destfile="build/asmack-jse${jar.suffix}.jar"
       filesonly="true"
       level="9"
     />
     <zip
-      basedir="build/src/trunk"
+      basedir="build/src"
       destfile="build/asmack-jse-source${jar.suffix}.zip"
       excludes="**/de/measite/smack/AndroidDebugger.java"
       filesonly="true"
@@ -52,25 +51,24 @@
 <target name="compile-a7" description="Compile for android API level 7" if="build-7">
     <delete dir="build/classes" failonerror="false" />
     <mkdir dir="build/classes" />
-    <mkdir dir="build/classes/trunk" />
     <javac
       target="1.5"
-      srcdir="build/src/trunk"
-      destdir="build/classes/trunk"
+      srcdir="build/src"
+      destdir="build/classes"
       classpath="lib/xmlpull_1_1_3_4c.jar"
       bootclasspath="${sdk-location}/platforms/android-7/android.jar"
       debug="true"
       debuglevel="source,lines"
     />
-    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
+    <copy todir="build/classes"><fileset dir="build/src" includes="META-INF/**" /></copy>
     <jar
-      basedir="build/classes/trunk"
+      basedir="build/classes"
       destfile="build/asmack-android-7${jar.suffix}.jar"
       filesonly="true"
       level="9"
     />
     <zip
-      basedir="build/src/trunk"
+      basedir="build/src"
       destfile="build/asmack-android-7-source${jar.suffix}.zip"
       filesonly="true"
       level="9"
@@ -80,25 +78,24 @@
 <target name="compile-a6" description="Compile for android API level 6" if="build-6">
     <delete dir="build/classes" failonerror="false" />
     <mkdir dir="build/classes" />
-    <mkdir dir="build/classes/trunk" />
     <javac
       target="1.5"
-      srcdir="build/src/trunk"
-      destdir="build/classes/trunk"
+      srcdir="build/src"
+      destdir="build/classes"
       classpath="lib/xmlpull_1_1_3_4c.jar"
       bootclasspath="${sdk-location}/platforms/android-6/android.jar"
       debug="true"
       debuglevel="source,lines"
     />
-    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
+    <copy todir="build/classes"><fileset dir="build/src" includes="META-INF/**" /></copy>
     <jar
-      basedir="build/classes/trunk"
+      basedir="build/classes"
       destfile="build/asmack-android-6${jar.suffix}.jar"
       filesonly="true"
       level="9"
     />
     <zip
-      basedir="build/src/trunk"
+      basedir="build/src"
       destfile="build/asmack-android-6-source${jar.suffix}.zip"
       filesonly="true"
       level="9"
@@ -108,25 +105,24 @@
 <target name="compile-a5" description="Compile for android API level 5" if="build-5">
     <delete dir="build/classes" failonerror="false" />
     <mkdir dir="build/classes" />
-    <mkdir dir="build/classes/trunk" />
     <javac
       target="1.5"
-      srcdir="build/src/trunk"
-      destdir="build/classes/trunk"
+      srcdir="build/src"
+      destdir="build/classes"
       classpath="lib/xmlpull_1_1_3_4c.jar"
       bootclasspath="${sdk-location}/platforms/android-5/android.jar"
       debug="true"
       debuglevel="source,lines"
     />
-    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
+    <copy todir="build/classes"><fileset dir="build/src" includes="META-INF/**" /></copy>
     <jar
-      basedir="build/classes/trunk"
+      basedir="build/classes"
       destfile="build/asmack-android-5${jar.suffix}.jar"
       filesonly="true"
       level="9"
     />
     <zip
-      basedir="build/src/trunk"
+      basedir="build/src"
       destfile="build/asmack-android-5-source${jar.suffix}.zip"
       filesonly="true"
       level="9"
@@ -136,25 +132,24 @@
 <target name="compile-a4" description="Compile for android API level 4" if="build-4">
     <delete dir="build/classes" failonerror="false" />
     <mkdir dir="build/classes" />
-    <mkdir dir="build/classes/trunk" />
     <javac
       target="1.5"
-      srcdir="build/src/trunk"
-      destdir="build/classes/trunk"
+      srcdir="build/src"
+      destdir="build/classes"
       classpath="lib/xmlpull_1_1_3_4c.jar"
       bootclasspath="${sdk-location}/platforms/android-4/android.jar"
       debug="true"
       debuglevel="source,lines"
     />
-    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
+    <copy todir="build/classes"><fileset dir="build/src" includes="META-INF/**" /></copy>
     <jar
-      basedir="build/classes/trunk"
+      basedir="build/classes"
       destfile="build/asmack-android-4${jar.suffix}.jar"
       filesonly="true"
       level="9"
     />
     <zip
-      basedir="build/src/trunk"
+      basedir="build/src"
       destfile="build/asmack-android-4-source${jar.suffix}.zip"
       filesonly="true"
       level="9"
diff --git a/patch/23-strip-unused-xml-transform.patch b/patch/23-strip-unused-xml-transform.patch
index 9759189..2825215 100644
--- a/patch/23-strip-unused-xml-transform.patch
+++ b/patch/23-strip-unused-xml-transform.patch
@@ -1,6 +1,19 @@
 --- org/jivesoftware/smackx/pubsub/util/XmlUtils.java
 +++ org/jivesoftware/smackx/pubsub/util/XmlUtils.java
-@@ -28,32 +28,6 @@ import javax.xml.transform.stream.StreamSource;
+@@ -15,12 +15,6 @@
+ 
+ import java.io.StringReader;
+ 
+-import javax.xml.transform.OutputKeys;
+-import javax.xml.transform.Transformer;
+-import javax.xml.transform.TransformerFactory;
+-import javax.xml.transform.stream.StreamResult;
+-import javax.xml.transform.stream.StreamSource;
+-
+ /**
+  * Simple utility for pretty printing xml.
+  * 
+@@ -28,32 +22,6 @@
   */
  public class XmlUtils
  {
diff --git a/src/AndroidManifest.xml b/src/AndroidManifest.xml
new file mode 100644
index 0000000..563e410
--- /dev/null
+++ b/src/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.asmack">
+    <uses-sdk android:minSdkVersion="4" />
+</manifest>