diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 3cfe2d9e97..6b77f7f8e9 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,4 +1,4 @@
-NDK_TOOLCHAIN_VERSION := clang3.6
+NDK_TOOLCHAIN_VERSION := clang
 APP_PLATFORM := android-15
 APP_STL := c++_static
 
diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf
index fc1772b978..6c498513b6 100644
--- a/tools/mkspecs/android-clang/qmake.conf
+++ b/tools/mkspecs/android-clang/qmake.conf
@@ -1,23 +1,22 @@
-# NDK_ROOT should be defined for qmake
-# NDK_HOST should be defined for qmake
-# NDK_ABI optionally can be defined to armeabi, armeabi-v7a, mips or x86, by default armeabi will be used
+# NDK_ROOT should be defined for qmake.
+# NDK_HOST should be defined for qmake.
+# NDK_ABI optionally can be defined to any abi supported by NDK.
 
 #########################################################################
 
 ANDROID_TARGET_ABI = $$(NDK_ABI)
-# by default use armv7 architecture
-isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a
+# By default use armv7 architecture with hardware math co-processor.
+isEmpty( ANDROID_TARGET_ABI ): ANDROID_TARGET_ABI = armeabi-v7a-hard
 
-# Minimum supported platform is Android 4.0.3
+# Minimum supported platform is Android 4.0.3.
 ANDROID_PLATFORM = android-15
 
-GCC_VERSION = 4.8
-CLANG_VERSION = 3.6
+GCC_VERSION = 4.9
 
 MAKEFILE_GENERATOR = UNIX
-QMAKE_COMPILER     = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang
+QMAKE_COMPILER     = $$(NDK_ROOT)/toolchains/llvm/prebuilt/$$(NDK_HOST)/bin/clang
 QMAKE_CC           = $$QMAKE_COMPILER
-QMAKE_CXX          = $$(NDK_ROOT)/toolchains/llvm-$$CLANG_VERSION/prebuilt/$$(NDK_HOST)/bin/clang++
+QMAKE_CXX          = $$(NDK_ROOT)/toolchains/llvm/prebuilt/$$(NDK_HOST)/bin/clang++
 QMAKE_LINK_C       = $$QMAKE_CC
 QMAKE_LINK_C_SHLIB = $$QMAKE_CC
 QMAKE_LINK         = $$QMAKE_CXX