diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index ad147947..2b84f90b 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -225,7 +225,7 @@ build_libretro_generic_makefile() {
 			echo "$1 running retrolink ($jobid)"
 			$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		fi
-		cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT}
+		cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${DISTDIR}.${FORMAT_EXT}
 	else
 		MESSAGE="$1 build failed ($jobid)"
 	fi
diff --git a/libretro-config.sh b/libretro-config.sh
index 8d6eb29e..daa89cf2 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -144,7 +144,7 @@ case "$platform" in
 				android)
 					FORMAT_EXT="so"
 					FORMAT_COMPILER_TARGET="android"
-					DIST_DIR="android"
+					DIST_DIR="android/armeabi-v7a"
 					;;
 				*android-armv7*)
 					FORMAT_EXT="so"
diff --git a/recipes/android/ndk-standalone b/recipes/android/ndk-standalone-armv7
similarity index 100%
rename from recipes/android/ndk-standalone
rename to recipes/android/ndk-standalone-armv7
diff --git a/recipes/android/ndk-standalone.conf b/recipes/android/ndk-standalone-armv7.conf
similarity index 100%
rename from recipes/android/ndk-standalone.conf
rename to recipes/android/ndk-standalone-armv7.conf
diff --git a/recipes/android/ndk-standalone-mame-armv7.conf b/recipes/android/ndk-standalone-mame-armv7.conf
new file mode 100644
index 00000000..e70bc376
--- /dev/null
+++ b/recipes/android/ndk-standalone-mame-armv7.conf
@@ -0,0 +1,2 @@
+mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame
+
diff --git a/recipes/android/ndk-standalone-mame.conf b/recipes/android/ndk-standalone-mame.conf
new file mode 100644
index 00000000..8b5464fb
--- /dev/null
+++ b/recipes/android/ndk-standalone-mame.conf
@@ -0,0 +1,6 @@
+PATH /tmp/test/bin
+PLATFORM android
+platform android
+SUFFIX _android
+DISTDIR _armeabi-v7a
+MAKE make