diff --git a/dist/info/button_test_libretro.info b/dist/info/testinput_buttontest_libretro.info
similarity index 100%
rename from dist/info/button_test_libretro.info
rename to dist/info/testinput_buttontest_libretro.info
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index b5c78aaa..91669c0f 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -165,6 +165,11 @@ build_libretro_database() {
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/tgdb/${1}.dat"'
 		fi
 
+		#Check if meta libretro-dats folder is there
+		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat" ]; then
+			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/libretro-dats/${1}.dat"'
+		fi
+
 		#Check if meta no-intro is there
 		if [ -f "${LIBRETRODATABASE_META_DAT_DIR}/no-intro/${1}.dat" ]; then
 			COMMAND+=' "${LIBRETRODATABASE_META_DAT_DIR}/no-intro/${1}.dat"'
diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 673bdc24..cd531e8e 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -1625,15 +1625,23 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
 		cp retroarch.cfg retroarch.default.cfg
 
 		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch
-		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/info
+		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores
+		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cores/info
 		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/remaps
 		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/cheats
 		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters
 		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters/audio
 		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/filters/video
+		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/database
+		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/database/rdb
+		mkdir -p $WORK/$RADIR/pkg/3ds/retroarch/database/cursors
+
+
 		cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/3ds/retroarch/filters/video/
 		cp -v $WORK/$RADIR/audio/audio_filters/*.dsp $WORK/$RADIR/pkg/3ds/retroarch/filters/audio/
-		cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/3ds/retroarch/info/
+		cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/3ds/retroarch/cores/info/
+		cp -v $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/3ds/retroarch/database/rdb/
+		cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/3ds/retroarch/database/cursors/
 	fi
 fi
 
diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic
index 0cc0795a..2df82580 100644
--- a/recipes/apple/cores-ios9-generic
+++ b/recipes/apple/cores-ios9-generic
@@ -21,7 +21,7 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20
 fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 ffmpeg libretro-ffmpeg  https://github.com/libretro/FFmpeg.git PROJECT YES GENERIC_GL Makefile libretro 
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . 
-gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile 
+gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . 
 gw libretro-gw https://github.com/libretro/gw-libretro.git PROJECT YES GENERIC Makefile . 
diff --git a/recipes/nintendo/3ds.ra b/recipes/nintendo/3ds.ra
index 014afb12..ec721ad9 100644
--- a/recipes/nintendo/3ds.ra
+++ b/recipes/nintendo/3ds.ra
@@ -1,3 +1,4 @@
 retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES . 
 overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media 
 libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media 
+assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch/media 
diff --git a/recipes/playstation/psp b/recipes/playstation/psp
index 42bd3cd9..173ac52a 100644
--- a/recipes/playstation/psp
+++ b/recipes/playstation/psp
@@ -1,6 +1,6 @@
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git PROJECT YES GENERIC Makefile . 
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git PROJECT YES GENERIC Makefile . USE_BLARGG_APU=1 
-fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
+fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . 
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile . 
 lutro libretro-lutro https://github.com/libretro/libretro-lutro PROJECT YES GENERIC Makefile .