diff --git a/build.xml b/build.xml
index 7bb49e866..6ad75ae77 100644
--- a/build.xml
+++ b/build.xml
@@ -32,18 +32,10 @@
          application and should be checked into Version Control Systems. -->
     <property file="default.properties" />
 
-    <!-- Custom Android task to deal with the project target, and import the
-         proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+
+    <!-- Required pre-setup import -->
+    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
+
 
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
@@ -60,12 +52,15 @@
     </target>
 -->
 
-
     <!-- Execute the Android Setup task that will setup some properties
          specific to the target, and import the build rules files.
 
          The rules file is imported from
-            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+            <SDK>/tools/ant/
+         Depending on the project type it can be either:
+         - main_rules.xml
+         - lib_rules.xml
+         - test_rules.xml
 
          To customize existing targets, there are two options:
          - Customize only one target:
diff --git a/tools/build-release b/tools/build-release
index ba56f165d..95ced8247 100755
--- a/tools/build-release
+++ b/tools/build-release
@@ -5,5 +5,6 @@
 # of Android Terminal Emulator.
 
 cd ~/code/Android-Terminal-Emulator
+rm -rf bin obj
 cd jni
 ~/code/android-ndk-r5b/ndk-build && cd .. && ant release && mv bin/Term-release.apk bin/Term.apk
diff --git a/tools/update.sh b/tools/update.sh
new file mode 100755
index 000000000..01e33465c
--- /dev/null
+++ b/tools/update.sh
@@ -0,0 +1 @@
+~/code/android-sdk-mac_x86/tools/android update project -p ~/code/Android-Terminal-Emulator --name "Term" --target "android-11"