diff --git a/Makefile b/Makefile
index e08520a8e2..4ec77cfab6 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
 DEFINES += -DASSETS_DIR='"$(DESTDIR)$(ASSETS_DIR)"'
 DEFINES += -DFILTERS_DIR='"$(DESTDIR)$(FILTERS_DIR)"'
+DEFINES += -DCORE_INFO_DIR='"$(DESTDIR)$(CORE_INFO_DIR)"'
 
 OBJDIR_BASE := obj-unix
 
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index b20ae1a99e..d4bb84d303 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -1772,6 +1772,12 @@ static void frontend_unix_get_env(int *argc,
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
          "core_info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
 #else
+#ifdef CORE_INFO_DIR
+   if (path_is_directory(CORE_INFO_DIR "/cores"))
+      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], CORE_INFO_DIR,
+            "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
+   else
+#endif
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
          "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
 #endif
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 9cd86a8b10..c3fbefc6b3 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -153,6 +153,8 @@ fi
 }
 
 add_define MAKEFILE ASSETS_DIR "${ASSETS_DIR:-$SHARE_DIR}/retroarch"
+add_define MAKEFILE FILTERS_DIR "${FILTERS_DIR:-$SHARE_DIR}/retroarch"
+add_define MAKEFILE CORE_INFO_DIR "${CORE_INFO_DIR:-$SHARE_DIR}/retroarch"
 add_define MAKEFILE BIN_DIR "${BIN_DIR:-${PREFIX}/bin}"
 add_define MAKEFILE DOC_DIR "${DOC_DIR:-${SHARE_DIR}/doc/retroarch}"
 add_define MAKEFILE MAN_DIR "${MAN_DIR:-${SHARE_DIR}/man}"
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 774b8e55eb..153519a8d8 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -1,6 +1,7 @@
 HAVE_LIBRETRO=             # Libretro library used
 HAVE_ASSETS_DIR=           # Assets install directory
 HAVE_FILTERS_DIR=          # Audio/video filters directory
+HAVE_CORE_INFO_DIR=        # Core info directory
 HAVE_CORE_INFO_CACHE=yes   # Core info cache support
 HAVE_BLUETOOTH=no          # Bluetooth support
 HAVE_NVDA=yes              # NVDA support