diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index a1e13c9f..34ecf249 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -226,12 +226,14 @@ build_libretro_generic_makefile() {
 			echo "$1 running retrolink [$jobid]"
 			$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		fi
-		      strip -s ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
+          	      if [ "${PLATFORM}" = "windows" ]; then
+                         strip -s ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
+                      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 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
-		        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
+		MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 
 
 
@@ -276,9 +278,14 @@ build_libretro_leiradel_makefile() {
 
 	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
+                if [ "${PLATFORM}" = "android" ]; then
+                   cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT}  &>> /tmp/buildbot.log
+                else
+                   cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT}  &>> /tmp/buildbot.log
+
+                fi
 	else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 	        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 
@@ -328,7 +335,7 @@ build_libretro_generic_theos() {
 		MESSAGE="$1 build successful [$jobid]"
 		cp -v objs/obj/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 	else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 	fi
@@ -374,7 +381,7 @@ build_libretro_generic_jni() {
 			buildbot_log "$MESSAGE"
 			cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="$1-$a build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 			echo BUILDBOT JOB: $MESSAGE
@@ -421,7 +428,7 @@ build_libretro_bsnes_jni() {
 			MESSAGE="$1 build successful [$jobid]"
 			cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 		fi
@@ -469,7 +476,7 @@ build_libretro_generic_gl_makefile() {
 		MESSAGE="$1 build successful [$jobid]"
 		cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 	else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 	fi
@@ -530,7 +537,7 @@ build_libretro_bsnes() {
 			cp -fv "out/${NAME}_${PROFILE}_libretro${FORMAT}.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		fi
 	else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="$1 build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 	fi
@@ -756,7 +763,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 
 		if [ "${ENABLED}" = "YES" ]; then
 			echo "BUILDBOT JOB: $jobid Processing $NAME"
-			echo 
+			echo
 			echo NAME: $NAME
 			echo DIR: $DIR
 			echo PARENT: $PARENTDIR
@@ -861,19 +868,25 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
                 mkdir -p android/phoenix/assets/cores
                 mkdir -p android/phoenix/assets/info
                 mkdir -p android/phoenix/assets/overlays
-                mkdir -p android/phoenix/assets/shaders/shaders_glsl
-                mkdir -p android/phoenix/assets/libretrodb
+                mkdir -p android/phoenix/assets/shaders_glsl
+                mkdir -p android/phoenix/assets/database
                 mkdir -p android/phoenix/assets/autoconfig
+                mkdir -p android/phoenix/assets/cheats
+                mkdir -p android/phoenix/assets/playlists
+
 
 
 		cp -rfv media/assets/* android/phoenix/assets/assets/
 		cp -rfv media/autoconfig/* android/phoenix/assets/autoconfig/
 		#cp -rfv media/libretrodb/cht android/phoenix/assets/libretrodb/
-		cp -rfv media/libretrodb/rdb android/phoenix/assets/libretrodb/
-		cp -rfv media/libretrodb/cursors android/phoenix/assets/libretrodb/
+		cp -rfv media/libretrodb/rdb android/phoenix/assets/database/
+		cp -rfv media/libretrodb/cursors android/phoenix/assets/database/
 		cp -rfv media/overlays/* android/phoenix/assets/overlays/
 		cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders/shaders_glsl/
 		cp -rfv media/shaders_glsl /tmp/
+                touch  android/phoenix/assets/cheats/placeholder
+                touch  android/phoenix/assets/cheats/placeholder
+
 		cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/
 
 		echo "BUILDBOT JOB: $jobid Building"
@@ -892,7 +905,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 			MESSAGE="retroarch build successful [$jobid]"
 			echo $MESSAGE
 		else
-                ERROR=`cat /tmp/buildbot.log | tail -n 1000`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 			echo $MESSAGE
@@ -1242,7 +1255,7 @@ EOF
 			cp -Rfv gfx/video_filters/*.dll windows/filters/video
 			cp -Rfv gfx/video_filters/*.filt windows/filters/video
 		else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 		echo $MESSAGE
@@ -1356,7 +1369,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 				MESSAGE="retroarch build successful [$jobid]"
 				echo $MESSAGE
 			else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 				echo $MESSAGE
@@ -1487,7 +1500,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
 				MESSAGE="retroarch build successful [$jobid]"
 				echo $MESSAGE
 			else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 				echo $MESSAGE
@@ -1637,7 +1650,7 @@ then
             MESSAGE="retroarch build successful [$jobid]"
             echo $MESSAGE
 	    else
-                ERROR=`cat /tmp/buildbot.log | tail -n 500`
+                ERROR=`cat /tmp/buildbot.log | tail -n 100`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
             echo $MESSAGE
diff --git a/recipes/android/gw b/recipes/android/gw
new file mode 100644
index 00000000..6c777a1b
--- /dev/null
+++ b/recipes/android/gw
@@ -0,0 +1,6 @@
+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
diff --git a/recipes/android/gw.conf b/recipes/android/gw.conf
new file mode 100644
index 00000000..fbcdb5dd
--- /dev/null
+++ b/recipes/android/gw.conf
@@ -0,0 +1,9 @@
+ANDROID_HOME /opt/android-sdk
+NDK_ROOT /opt/android-ndk
+NDK_ROOT_DIR /opt/android-ndk
+ANDROID_NDK /opt/android-ndk
+PATH /opt/android-ndk:/opt/android-sdk/tools
+PLATFORM android
+platform android
+MAKE make
+SUFFIX _android
diff --git a/recipes/linux-portable/portable b/recipes/linux-portable/portable
index 57406b39..54155e36 100644
--- a/recipes/linux-portable/portable
+++ b/recipes/linux-portable/portable
@@ -2,6 +2,7 @@
 4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT YES GENERIC Makefile . 
 beetle_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT NO GENERIC Makefile . 
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT YES GENERIC Makefile.libretro . 
+bnes libretro-bnes https://github.com/libretro/bnes-libretro.git PROJECT YES BSNES Makefile . bnes 
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . accuracy 
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . balanced 
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES Makefile . performance 
diff --git a/recipes/linux-portable/portable-gw b/recipes/linux-portable/portable-gw
index 5ffdb29f..275fbd91 100644
--- a/recipes/linux-portable/portable-gw
+++ b/recipes/linux-portable/portable-gw
@@ -1,2 +1,3 @@
-gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES GENERIC Makefile.linux_x86_64 build
+gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES LEIRADEL Makefile build linux_x86_64
+
 
diff --git a/recipes/linux-portable/portable-gw.conf b/recipes/linux-portable/portable-gw.conf
index 4c166532..ca41d7d9 100644
--- a/recipes/linux-portable/portable-gw.conf
+++ b/recipes/linux-portable/portable-gw.conf
@@ -1,3 +1,2 @@
 platform unix
 MAKEPORTABLE YES
-SUFFIX .linux_x86_64