diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index fc7c6300..6a0b6c5c 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -278,7 +278,7 @@ 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
+                cp -v ${NAME}_libretro${FORMAT}.${ARGS}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${ARGS}/${NAME}_libretro${SUFFIX}${FORMAT}.${FORMAT_EXT}  &>> /tmp/buildbot.log
 	else
                 ERROR=`cat /tmp/buildbot.log | tail -n 300`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
@@ -867,6 +867,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
                 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/
@@ -877,7 +879,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 		cp -rfv media/overlays/* android/phoenix/assets/overlays/
 		cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders_glsl/
 		cp -rfv media/shaders_glsl /tmp/
-                touch  android/phoenix/assets/cheats/cheatshere.txt
+                touch  android/phoenix/assets/cheats/placeholder
+                touch  android/phoenix/assets/cheats/placeholder
 
 		cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/
 
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