diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 10d2d5be..5d4a0e40 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -363,10 +363,9 @@ build_libretro_generic_makefile() {
 		echo -------------------------------------------------- | tee -a "$LOGFILE"
 		if [ "${COMMAND}" = "CMAKE" ]; then
 			if [ "${PLATFORM}" = "android" ]; then
-				EXTRAARGS="-DCMAKE_SYSTEM_NAME=Android \
-					-DCMAKE_SYSTEM_VERSION=${API_LEVEL} \
-					-DCMAKE_ANDROID_ARCH_ABI=${ABI_OVERRIDE} \
-					-DCMAKE_ANDROID_NDK=${NDK_ROOT}"
+				EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
+					-DANDROID_ABI=${ABI_OVERRIDE} \
+					-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake"
 			fi
 
 			eval "set -- ${EXTRAARGS} \${CORE_ARGS}"
@@ -397,6 +396,8 @@ build_libretro_generic_makefile() {
 
 		if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then
 			${STRIP:=strip} -s ${OUT}/${CORENAM}
+		elif [ "${PLATFORM}" = "android" -a ! -z "${STRIPPATH+x}" ]; then
+			${NDK_ROOT}/${STRIPPATH} -s ${OUT}/${CORENAM}
 		fi
 
 		echo "COPY CMD: cp -v ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE"
diff --git a/recipes/android/cores-android-cmake-aarch64 b/recipes/android/cores-android-cmake-aarch64
index 8117b5dc..96a15771 100644
--- a/recipes/android/cores-android-cmake-aarch64
+++ b/recipes/android/cores-android-cmake-aarch64
@@ -1 +1 @@
-ppsspp libretro-ppsspp-aarch64 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_BUILD_TYPE=Release
+ppsspp libretro-ppsspp-aarch64 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release
diff --git a/recipes/android/cores-android-cmake-aarch64.conf b/recipes/android/cores-android-cmake-aarch64.conf
index 1733cbeb..6b5993ac 100644
--- a/recipes/android/cores-android-cmake-aarch64.conf
+++ b/recipes/android/cores-android-cmake-aarch64.conf
@@ -14,3 +14,4 @@ CORE_JOB YES
 ABI_OVERRIDE arm64-v8a
 API_LEVEL 21
 CMAKE cmake
+STRIPPATH toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip
diff --git a/recipes/android/cores-android-cmake-armv7 b/recipes/android/cores-android-cmake-armv7
index f5b96bc3..141a054a 100644
--- a/recipes/android/cores-android-cmake-armv7
+++ b/recipes/android/cores-android-cmake-armv7
@@ -1 +1 @@
-ppsspp libretro-ppsspp-armv7 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_BUILD_TYPE=Release
+ppsspp libretro-ppsspp-armv7 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DCMAKE_BUILD_TYPE=Release
diff --git a/recipes/android/cores-android-cmake-armv7.conf b/recipes/android/cores-android-cmake-armv7.conf
index 5bea25d0..01cd72d0 100644
--- a/recipes/android/cores-android-cmake-armv7.conf
+++ b/recipes/android/cores-android-cmake-armv7.conf
@@ -14,3 +14,4 @@ CORE_JOB YES
 ABI_OVERRIDE armeabi-v7a
 API_LEVEL 9
 CMAKE cmake
+STRIPPATH toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip
diff --git a/recipes/android/cores-android-cmake-x86 b/recipes/android/cores-android-cmake-x86
index f2f08894..0049edd0 100644
--- a/recipes/android/cores-android-cmake-x86
+++ b/recipes/android/cores-android-cmake-x86
@@ -1 +1 @@
-ppsspp libretro-ppsspp-x86 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_BUILD_TYPE=Release
+ppsspp libretro-ppsspp-x86 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release
diff --git a/recipes/android/cores-android-cmake-x86.conf b/recipes/android/cores-android-cmake-x86.conf
index 644088c5..f31a15b9 100644
--- a/recipes/android/cores-android-cmake-x86.conf
+++ b/recipes/android/cores-android-cmake-x86.conf
@@ -14,3 +14,4 @@ CORE_JOB YES
 ABI_OVERRIDE x86
 API_LEVEL 9
 CMAKE cmake
+STRIPPATH toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-strip