diff --git a/limbo-android-arm/src/main/AndroidManifest.xml b/limbo-android-arm/src/main/AndroidManifest.xml
index c4cc30cdc..ffbf80fd0 100644
--- a/limbo-android-arm/src/main/AndroidManifest.xml
+++ b/limbo-android-arm/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
android:versionName="2.11.0-arm" >
diff --git a/limbo-android-lib/src/main/jni/android-config.mak b/limbo-android-lib/src/main/jni/android-config.mak
index 0f39233a3..64a9c2aad 100644
--- a/limbo-android-lib/src/main/jni/android-config.mak
+++ b/limbo-android-lib/src/main/jni/android-config.mak
@@ -68,13 +68,13 @@ NDK_ENV = windows
######### Armv8 64 bit (Newest ARM phones only, Supports VNC, Needs android-21)
-include $(LIMBO_JNI_ROOT)/android-device-config/android-generic-armv8.mak
+#include $(LIMBO_JNI_ROOT)/android-device-config/android-generic-armv8.mak
######### ARMv7 Soft Float (Most ARM phones, Supports VNC and SDL, Needs android-17)
#include $(LIMBO_JNI_ROOT)/android-device-config/android-generic-armv7a-softfp.mak
######### x86 (x86 Phones only, Supports VNC and SDL, Needs android-17)
-#include $(LIMBO_JNI_ROOT)/android-device-config/android-generic-x86.mak
+include $(LIMBO_JNI_ROOT)/android-device-config/android-generic-x86.mak
######### x86_64 (x86 64bit Phones only, Supports VNC, Needs android-21)
#include $(LIMBO_JNI_ROOT)/android-device-config/android-generic-x86_64.mak
diff --git a/limbo-android-ppc/src/main/AndroidManifest.xml b/limbo-android-ppc/src/main/AndroidManifest.xml
index 8fa614d42..8827839a8 100644
--- a/limbo-android-ppc/src/main/AndroidManifest.xml
+++ b/limbo-android-ppc/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
android:versionName="2.11.0-ppc" >
diff --git a/limbo-android-sparc/src/main/AndroidManifest.xml b/limbo-android-sparc/src/main/AndroidManifest.xml
index 6bc146f98..28118a24f 100644
--- a/limbo-android-sparc/src/main/AndroidManifest.xml
+++ b/limbo-android-sparc/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
android:versionName="2.11.0-sparc" >
diff --git a/limbo-android-x86/src/main/AndroidManifest.xml b/limbo-android-x86/src/main/AndroidManifest.xml
index ee2d3d12a..59ea5e484 100644
--- a/limbo-android-x86/src/main/AndroidManifest.xml
+++ b/limbo-android-x86/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
android:versionName="2.11.0-x86" >