diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 18470446..02d209d2 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -266,8 +266,8 @@ build_libretro_leiradel_makefile() {
 
 	if [ -z "${NOCLEAN}" ]; then
 		echo "cleaning up..."
-		echo "cleanup command: ${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
-		${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} clean
+		echo "cleanup command: ${MAKE} -f ${MAKEFILE}.${PLATFORM}-${ARGS} platform=${PLATFORM}-${ARGS} -j${JOBS} clean"
+		${MAKE} -f ${MAKEFILE}.${PLATFORM}-${ARGS} platform=${PLATFORM}-${ARGS} -j${JOBS} clean
 		if [ $? -eq 0 ]; then
 			echo BUILDBOT JOB: $jobid $1 cleanup success!
 		else
@@ -276,16 +276,12 @@ build_libretro_leiradel_makefile() {
 	fi
 
 	echo "compiling..."
-		echo "build command: ${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS}"
-		${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
+		echo "build command: ${MAKE} -f ${MAKEFILE}.${PLATFORM}-${ARGS} platform=${PLATFORM}-${ARGS} -j${JOBS}"
+		${MAKE} -f ${MAKEFILE}.${PLATFORM}-${ARGS} platform=${PLATFORM}-${ARGS} -j${JOBS} &> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
 
 		if [ $? -eq 0 ]; then
 			MESSAGE="$1 build successful [$jobid]"
-			if [ "${PLATFORM}" = "android" ]; then
-				cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT}  &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
-			else
-				cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT}  &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
-			fi
+              		cp -v ${NAME}_libretro.${PLATFORM}-${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}.${FORMAT_EXT}  &>> /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
 		else
 		ERROR=`cat /tmp/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log | tail -n 100`
 		HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
@@ -645,6 +641,27 @@ while read line; do
 					BUILD="YES"
 				fi
 
+				if [ "${PREVCORE}" = "81" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "LEIRADEL" ]; then
+					FORCE="YES"
+					BUILD="YES"
+				fi
+
+
+				if [ "${PREVCORE}" = "snes9x-next" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "LEIRADEL" ]; then
+					FORCE="YES"
+					BUILD="YES"
+				fi
+
+				if [ "${PREVCORE}" = "vba-next" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "LEIRADEL" ]; then
+					FORCE="YES"
+					BUILD="YES"
+				fi
+
+				if [ "${PREVCORE}" = "mgba" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "LEIRADEL" ]; then
+					FORCE="YES"
+					BUILD="YES"
+				fi
+
 
 				if [ "${PREVCORE}" = "bsnes_mercury" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then
 					FORCE="YES"
diff --git a/recipes/android/cores-leiradel b/recipes/android/cores-leiradel
index b79fa2ac..3e02989d 100644
--- a/recipes/android/cores-leiradel
+++ b/recipes/android/cores-leiradel
@@ -1,6 +1,18 @@
-gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build android-armeabi_v7a 
-gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build android-armeabi 
-gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build android-x86 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build android-armeabi_v7a 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build android-armeabi 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build android-x86 
+gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build armeabi_v7a 
+gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build armeabi 
+gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build x86 
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build armeabi_v7a 
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build armeabi 
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git PROJECT YES LEIRADEL Makefile build x86 
+mgba libretro-mgba https://github.com/libretro/mgba.git PROJECT YES LEIRADEL Makefile libretro-build armeabi_v7a
+mgba libretro-mgba https://github.com/libretro/mgba.git PROJECT YES LEIRADEL Makefile libretro-build armeabi
+mgba libretro-mgba https://github.com/libretro/mgba.git PROJECT YES LEIRADEL Makefile libretro-build x86
+snes9x_next libretro-snes9x-next https://github.com/libretro/snes9x-next.git PROJECT YES LEIRADEL Makefile build armeabi_v7a 
+snes9x_next libretro-snes9x-next https://github.com/libretro/snes9x-next.git PROJECT YES LEIRADEL Makefile build armeabi 
+snes9x_next libretro-snes9x-next https://github.com/libretro/snes9x-next.git PROJECT YES LEIRADEL Makefile build x86 
+81 libretro-81 https://github.com/libretro/81-libretro.git PROJECT YES LEIRADEL Makefile build armeabi_v7a 
+81 libretro-81 https://github.com/libretro/81-libretro.git PROJECT YES LEIRADEL Makefile build armeabi 
+81 libretro-81 https://github.com/libretro/81-libretro.git PROJECT YES LEIRADEL Makefile build x86 
+vba_next libretro-vba-next https://github.com/libretro/vba-next.git PROJECT YES LEIRADEL Makefile build armeabi_v7a 
+vba_next libretro-vba-next https://github.com/libretro/vba-next.git PROJECT YES LEIRADEL Makefile build armeabi 
+vba_next libretro-vba-next https://github.com/libretro/vba-next.git PROJECT YES LEIRADEL Makefile build x86 
diff --git a/recipes/android/cores-leiradel.conf b/recipes/android/cores-leiradel.conf
index bae25c66..70d0fe0e 100644
--- a/recipes/android/cores-leiradel.conf
+++ b/recipes/android/cores-leiradel.conf
@@ -1,9 +1,10 @@
-ANDROID_HOME /opt/android-sdk
-NDK_ROOT /opt/android-ndk-r10e
-NDK_ROOT_DIR /opt/android-ndk-r10e
-ANDROID_NDK /opt/android-ndk-r10e
-PATH /opt/android-ndk:/opt/android-sdk/tools
+ANDROID_HOME /opt/android-sdk-linux
+NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e
+NDK_ROOT_DIR /home/buildbot/tools/android/android-ndk-r10e
+ANDROID_NDK /home/buildbot/tools/android/android-ndk-r10e
+PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/android-sdk/tools
 PLATFORM android
 platform android
 MAKE make
 SUFFIX _android
+
diff --git a/recipes/android/cores-ndk b/recipes/android/cores-ndk
index f22ab9ab..8bbe5e6a 100644
--- a/recipes/android/cores-ndk
+++ b/recipes/android/cores-ndk
@@ -4,6 +4,7 @@
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES_JNI Makefile target-libretro/jni performance 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES_JNI Makefile target-libretro/jni performance 
 catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
+desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile android/eclipse/jni
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro jni 
 fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni 
diff --git a/recipes/android/cores-ndk.conf b/recipes/android/cores-ndk.conf
index fcb6ee4a..c8cdb78b 100644
--- a/recipes/android/cores-ndk.conf
+++ b/recipes/android/cores-ndk.conf
@@ -1,7 +1,7 @@
-ANDROID_HOME /opt/android-sdk
-NDK_ROOT /opt/android-ndk-r10e
-ANDROID_NDK /opt/android-ndk-r10e
-PATH /opt/android-ndk:/opt/android-sdk-linux_r24/tools
+ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
+NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e
+ANDROID_NDK /home/buildbot/tools/android/android-ndk-r10e
+PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/android-sdk-linux/tools
 PLATFORM android
 platform android
 MAKE make