diff --git a/build.bash b/build.bash
index ce793f9..26e4560 100755
--- a/build.bash
+++ b/build.bash
@@ -15,11 +15,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}" "."
   else
     cd "${2}"
     svn cleanup
-    svn up
+    svn up -r "${3}"
   fi
 )
 }
@@ -37,11 +37,11 @@ gitfetch() {
 }
 
 fetchall() {
-  gitfetch "git://github.com/rtreffer/smack.git" "smack"
-  fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid"
-  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony"
-  fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava"
-  fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh"
+  fetch "http://svn.igniterealtime.org/svn/repos/smack/trunk" "smack" "11644"
+  fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" "HEAD"
+  fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony" "HEAD"
+  fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" "HEAD"
+  fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" "HEAD"
 }
 
 copyfolder() {
@@ -62,6 +62,7 @@ buildsrc() {
   mkdir build/src
   mkdir build/src/trunk
   copyfolder "src/smack/source/" "build/src/trunk" "."
+  copyfolder "src/smack/jingle/extension/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"
diff --git a/build.xml b/build.xml
index 827f4c5..50054f1 100644
--- a/build.xml
+++ b/build.xml
@@ -57,7 +57,7 @@
       target="1.5"
       srcdir="build/src/trunk"
       destdir="build/classes/trunk"
-      classpath="lib/xmlpull_1_1_3_4c.jar"
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
       bootclasspath="${sdk-location}/platforms/android-7/android.jar"
       debug="true"
       debuglevel="source,lines"
@@ -85,7 +85,7 @@
       target="1.5"
       srcdir="build/src/trunk"
       destdir="build/classes/trunk"
-      classpath="lib/xmlpull_1_1_3_4c.jar"
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
       bootclasspath="${sdk-location}/platforms/android-6/android.jar"
       debug="true"
       debuglevel="source,lines"
@@ -113,7 +113,7 @@
       target="1.5"
       srcdir="build/src/trunk"
       destdir="build/classes/trunk"
-      classpath="lib/xmlpull_1_1_3_4c.jar"
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
       bootclasspath="${sdk-location}/platforms/android-5/android.jar"
       debug="true"
       debuglevel="source,lines"
@@ -141,7 +141,7 @@
       target="1.5"
       srcdir="build/src/trunk"
       destdir="build/classes/trunk"
-      classpath="lib/xmlpull_1_1_3_4c.jar"
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/jstun.jar"
       bootclasspath="${sdk-location}/platforms/android-4/android.jar"
       debug="true"
       debuglevel="source,lines"