diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 7129bfbe..1484aa39 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -22,10 +22,11 @@ read_link()
 SCRIPT=$(read_link "$0")
 echo "Script: $SCRIPT"
 BASE_DIR=$(dirname "$SCRIPT")
-RDB_DIR="$BASE_DIR/libretro-database/rdb"
+LIBRETRODATABASE_BASE_DIR="$BASE_DIR/retroarch/media/libretrodb"
+RDB_DIR="${LIBRETRODATABASE_BASE_DIR}/rdb"
 LIBRETRODB_BASE_DIR=libretrodb
-LIBRETRODATABASE_DAT_DIR=${BASE_DIR}/libretro-database/dat
-LIBRETRODATABASE_META_DAT_DIR=${BASE_DIR}/libretro-database/metadat
+LIBRETRODATABASE_DAT_DIR=${LIBRETRODATABASE_BASE_DIR}/dat
+LIBRETRODATABASE_META_DAT_DIR=${LIBRETRODATABASE_BASE_DIR}/metadat
 
 die()
 {
@@ -33,7 +34,7 @@ die()
    #exit 1
 }
 
-mkdir -p "$RDB_DIR"
+echo $LIBRETRODB_BASE
 
 build_libretrodb() {
    cd $BASE_DIR
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 50d44a2a..ae8698fc 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -112,6 +112,7 @@ fetch_subprojects "$REPO_BASE/libretro/common-shaders.git" "retroarch" "media" "
 fetch_subprojects "$REPO_BASE/libretro/common-overlays.git" "retroarch" "media" "overlays" "libretro/common-overlays"
 fetch_subprojects "$REPO_BASE/libretro/retroarch-assets.git" "retroarch" "media" "assets" "libretro/retroarch-assets"
 fetch_subprojects "$REPO_BASE/libretro/retroarch-joypad-autoconfig.git" "retroarch" "media" "autoconfig" "libretro/joypad-autoconfig"
+fetch_subprojects "$REPO_BASE/libretro/libretro-database.git" "retroarch" "media" "libretrodb" "libretro/libretro-database"
 fetch_project_bsnes "$REPO_BASE/libretro/bsnes-libretro.git" "libretro-bsnes" "libretro/bSNES"
 fetch_project "$REPO_BASE/libretro/snes9x.git" "libretro-snes9x" "libretro/SNES9x"
 fetch_project "$REPO_BASE/libretro/snes9x-next.git" "libretro-snes9x_next" "libretro/SNES9x-Next"
@@ -175,4 +176,3 @@ fetch_project "$REPO_BASE/libretro/TempGBA-libretro.git" "libretro-tempgba" "lib
 fetch_project "$REPO_BASE/libretro/gpsp.git" "libretro-gpsp" "libretro/gpsp"
 fetch_project "$REPO_BASE/libretro/emux.git" "libretro-emux" "libretro/Emux"
 fetch_project "$REPO_BASE/libretro/libretrodb.git" "libretrodb" "libretro/libretrodb"
-fetch_project "$REPO_BASE/libretro/libretro-database.git" "libretrodb" "libretro/libretro-database"