diff --git a/build.sh b/build.sh
index f78520b76..6e27eb95d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Set here your own NDK path if needed
-# export PATH=$PATH:~/src/endless_space/android-ndk-r5b
+# export PATH=$PATH:~/src/endless_space/android-ndk-r7
 NDKBUILDPATH=$PATH
 export `grep "AppFullName=" AndroidAppSettings.cfg`
 if ( grep "package $AppFullName;" project/src/Globals.java > /dev/null && \
diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index b0e3802ee..39854a840 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -21,8 +21,8 @@ ifneq ($(findstring r4-crystax,$(NDK_VERSION)),)
 $(info Building with CrystaX r4 toolchain - internal STLPort disabled)
 CRYSTAX_TOOLCHAIN := 1
 endif
-ifneq ($(findstring r6b,$(NDK_VERSION))$(findstring r6-crystax,$(NDK_VERSION)),)
-$(info Building with NDK r6)
+ifneq ($(findstring r6b,$(NDK_VERSION))$(findstring r6-crystax,$(NDK_VERSION))$(findstring r7,$(NDK_VERSION))$(findstring r8,$(NDK_VERSION))$(findstring r9,$(NDK_VERSION)),)
+$(info Building with NDK r6b or r7)
 NDK_R6_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r5c,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION))$(NDK_R6_TOOLCHAIN),)