diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index bd89aa8a..5dad8ad6 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -226,11 +226,7 @@ build_libretro_generic_makefile() {
 			echo "$1 running retrolink [$jobid]"
 			$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		fi
-                   if [ "${NAME}" = "gw" ]; then
-   		      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}  &> /tmp/buildbot.log
-                   else
-   		      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}  &> /tmp/buildbot.log
-                   fi
+                      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}  &> /tmp/buildbot.log
 	else
                 ERROR=`cat /tmp/buildbot.log | tail -n 5000`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
@@ -244,6 +240,56 @@ build_libretro_generic_makefile() {
 	JOBS=$OLDJ
 }
 
+
+build_libretro_leiradel_makefile() {
+
+	NAME=$1
+	DIR=$2
+	SUBDIR=$3
+	MAKEFILE=$4
+	PLATFORM=$5
+	ARGS=$6
+
+	cd $DIR
+	cd $SUBDIR
+	OLDJ=$JOBS
+
+	if [ "${NAME}" = "mame078" ]; then
+		JOBS=1
+	fi
+
+	if [ -z "${NOCLEAN}" ]; then
+		echo "cleaning up..."
+		echo "cleanup command: ${MAKE}.${ARGS} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
+		${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} clean
+		if [ $? -eq 0 ]; then
+			echo BUILDBOT JOB: $jobid $1 cleanup success!
+		else
+			echo BUILDBOT JOB: $jobid $1 cleanup failure!
+		fi
+	fi
+
+	echo "compiling..."
+		echo "build command: ${MAKE}.${ARGS} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
+		${MAKE} -f ${MAKEFILE}.${ARGS} platform=${PLATFORM} -j${JOBS} &> /tmp/buildbot.log
+
+	if [ $? -eq 0 ]; then
+		MESSAGE="$1 build successful [$jobid]"
+                cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}  &>> /tmp/buildbot.log
+	else
+                ERROR=`cat /tmp/buildbot.log | tail -n 5000`
+                HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
+	        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
+
+
+
+	fi
+	echo BUILDBOT JOB: $MESSAGE
+	buildbot_log "$MESSAGE"
+	JOBS=$OLDJ
+}
+
+
 build_libretro_generic_theos() {
 	echo PARAMETERS: DIR $2, SUBDIR: $3, MAKEFILE: $4
 
@@ -577,6 +623,12 @@ while read line; do
 					BUILD="YES"
 				fi
 
+				if [ "${PREVCORE}" = "gw" -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"
 					BUILD="YES"
@@ -652,6 +704,8 @@ while read line; do
 			echo building core...
 			if [ "${COMMAND}" = "GENERIC" ]; then
 				build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
+			elif [ "${COMMAND}" = "LEIRADEL" ]; then
+				build_libretro_leiradel_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
 			elif [ "${COMMAND}" = "GENERIC_GL" ]; then
 				build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
 			elif [ "${COMMAND}" = "GENERIC_ALT" ]; then