diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 88b3a574..b3615810 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -616,6 +616,82 @@ while read line; do
 		if [ -n ${TEMP} ]; then
 			ARGS="${ARGS} ${TEMP}"
 		fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 15 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 16 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 17 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 18 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 19 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 20 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 21 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+
+                TEMP=""
+                TEMP=`echo $line | cut -f 22 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 23 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 24 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 25 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 26 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 27 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 28 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
+                TEMP=""
+                TEMP=`echo $line | cut -f 29 -d " "`
+                if [ -n ${TEMP} ]; then
+                        ARGS="${ARGS} ${TEMP}"
+                fi
 
 		ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
 
diff --git a/recipes/android/cores-ndk-standalone-mame-armv7 b/recipes/android/cores-ndk-standalone-mame-armv7
index 4216feff..d40d0fd5 100644
--- a/recipes/android/cores-ndk-standalone-mame-armv7
+++ b/recipes/android/cores-ndk-standalone-mame-armv7
@@ -1,4 +1,4 @@
-mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . 
+mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC makefile . OSD="retro" RETRO=1 NOWERROR=1 NOASM=1 gcc="android-arm" TARGETOS="android-arm" CONFIG=libretro USE_BGFX=0 NO_USE_MIDI="1"
 mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame 
 mess2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess 
 ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume 
diff --git a/recipes/android/cores-ndk-standalone-mame-armv7.conf b/recipes/android/cores-ndk-standalone-mame-armv7.conf
index eb3c2fb4..9eac8392 100644
--- a/recipes/android/cores-ndk-standalone-mame-armv7.conf
+++ b/recipes/android/cores-ndk-standalone-mame-armv7.conf
@@ -1,4 +1,6 @@
 PATH /home/buildbot/tools/android/android-ndk-standalone-arm/bin/
+ANDROID_NDK_ARM /home/buildbot/tools/android/android-ndk-r10e/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64
+ANDROID_NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e/
 PLATFORM android
 platform android
 SUFFIX _android