diff --git a/Makefile b/Makefile
index 2b8845c57..d618cfca4 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ BUILD_SILK=1
 BUILD_G729=1
 BUILD_TUNNEL=0
 BUILD_WEBRTC_AECM=1
+BUILD_FOR_X86=0
 USE_JAVAH=1
 
 all: update-project prepare-sources install-apk run-linphone
@@ -83,7 +84,7 @@ prepare-mediastreamer2:
 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
 
 generate-libs:
-	$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS)
 
 update-project:
 	$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
diff --git a/jni/Application.mk b/jni/Application.mk
index a6b5d829a..e502c0948 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -79,6 +79,8 @@ linphone-root-dir:=$(APP_PROJECT_PATH)
 
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-8
-#APP_ABI := armeabi
-APP_ABI := armeabi-v7a armeabi x86
+APP_ABI := armeabi-v7a armeabi
+ifeq ($(BUILD_FOR_X86), 1)
+APP_ABI += x86
+endif
 APP_CFLAGS:=-DDISABLE_NEON