diff --git a/build/android/Makefile b/build/android/Makefile
index 287acdaac..623b4e2c9 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -26,7 +26,7 @@ TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
 TARGET_ARCH = armv7
 CROSS_PREFIX = arm-linux-androideabi-
-COMPILER_VERSION = 4.9
+COMPILER_VERSION = clang3.6
 HAVE_LEVELDB = 0
 
 ################################################################################
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 986efedbe..f7976d4d7 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -80,7 +80,7 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_      \
 ifndef NDEBUG
 LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
 else
-LOCAL_CFLAGS += -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -O3 -march=armv7-a
+LOCAL_CFLAGS += -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -Ofast -fno-fast-math -march=armv7-a
 # ToDo - disable for x86?
 endif
 
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
index 7268ae951..aa983f573 100644
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,8 +1,3 @@
-# NDK_TOOLCHAIN_VERSION := clang3.3
-
 APP_PLATFORM := android-16
 APP_MODULES := multicraft
-APP_STL := gnustl_static
-
-APP_CPPFLAGS += -fexceptions
-APP_GNUSTL_FORCE_CPP_FEATURES := rtti
+APP_STL := gnustl_static
\ No newline at end of file