diff --git a/build.sh b/build.sh
index c2f280481..3ebcd21f2 100755
--- a/build.sh
+++ b/build.sh
@@ -25,7 +25,7 @@ fi
 
 cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build -j4 V=1 && \
  { grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \
-   [ -`which ndk-build | grep /android-ndk-r5b/` != - ] && \
+   [ -`which ndk-build | grep '/android-ndk-r5b/\|/android-ndk-r5-crystax/'` != - ] && \
    echo Stripping libapplication.so by hand \
    rm obj/local/armeabi/libapplication.so && \
    cp jni/application/src/libapplication.so obj/local/armeabi && \
diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index dc99972df..5d9f76415 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -17,11 +17,11 @@ $(info Cannot determine NDK version, assuming NDK r5b - please do not rename NDK
 NDK_VERSION := r5b
 endif
 
-ifneq ($(findstring -crystax,$(NDK_VERSION)),)
+ifneq ($(findstring r4-crystax,$(NDK_VERSION)),)
 $(info Building with CrystaX toolchain - internal STLPort disabled)
 CRYSTAX_TOOLCHAIN := 1
 endif
-ifneq ($(findstring r5b,$(NDK_VERSION)),)
+ifneq ($(findstring r5b,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION)),)
 $(info Building with NDK r5b - internal STLPort disabled)
 NDK_R5_TOOLCHAIN := 1
 endif
diff --git a/project/jni/application/setEnvironment-r5b.sh b/project/jni/application/setEnvironment-r5b.sh
index 09c46de07..8d63c0f49 100755
--- a/project/jni/application/setEnvironment-r5b.sh
+++ b/project/jni/application/setEnvironment-r5b.sh
@@ -25,8 +25,8 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 echo LOCAL_PATH $LOCAL_PATH
 
-if [ -z "`echo $NDK | grep 'android-ndk-r5b'`" ] ; then
-	echo "The only supported NDK version is android-ndk-r5b, please download it from http://developer.android.com/"
+if [ -z "`echo $NDK | grep 'android-ndk-r5b'``echo $NDK | grep 'android-ndk-r5-crystax'`" ] ; then
+	echo "The only supported NDK versions are android-ndk-r5b or android-ndk-r5-crystax"
 	exit 1
 fi