diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 63704cc..c5f2c25 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,6 +29,8 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 
+	<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+
 	<supports-screens />
 
 	<application
diff --git a/build.xml b/build.xml
index 8f92989..a53621c 100644
--- a/build.xml
+++ b/build.xml
@@ -127,6 +127,23 @@
             includes="**/*.pot **/*.po" />
     </target>
 
+    <target name="-check-ndk">
+        <fail
+            message="ndk.dir is missing. Make sure to put it in local.properties"
+            unless="ndk.dir"
+        />
+    </target>
+
+    <target name="native-build" depends="-check-ndk">
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true" />
+    </target>
+
+    <target name="native-clean" depends="-check-ndk">
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+            <arg value="clean" />
+        </exec>
+    </target>
+
 <!-- End custom ConnectBot stuff -->
 
    <!-- quick check on sdk.dir -->
diff --git a/jni/Application.mk b/jni/Application.mk
new file mode 100644
index 0000000..0a352f9
--- /dev/null
+++ b/jni/Application.mk
@@ -0,0 +1,2 @@
+# Build both ARMv5TE and x86-32 machine code.
+APP_ABI := armeabi x86
diff --git a/jni/Exec/Android.mk b/jni/Exec/Android.mk
index 7abfdf5..505b7cb 100644
--- a/jni/Exec/Android.mk
+++ b/jni/Exec/Android.mk
@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := com_google_ase_Exec
+LOCAL_CFLAGS    := -Werror
 LOCAL_SRC_FILES := com_google_ase_Exec.cpp
 LOCAL_LDLIBS    := -llog
 
diff --git a/libs/armeabi/libcom_google_ase_Exec.so b/libs/armeabi/libcom_google_ase_Exec.so
index 20fd499..eca95a6 100755
Binary files a/libs/armeabi/libcom_google_ase_Exec.so and b/libs/armeabi/libcom_google_ase_Exec.so differ
diff --git a/libs/x86/libcom_google_ase_Exec.so b/libs/x86/libcom_google_ase_Exec.so
new file mode 100755
index 0000000..55f602d
Binary files /dev/null and b/libs/x86/libcom_google_ase_Exec.so differ