diff --git a/Makefile b/Makefile
index c69ba67393..e08520a8e2 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,8 @@ DEF_FLAGS := -I.
 ASFLAGS :=
 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)"'
 
 OBJDIR_BASE := obj-unix
 
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index 4a3b928cb4..b20ae1a99e 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -1778,6 +1778,13 @@ static void frontend_unix_get_env(int *argc,
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
          "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
 
+#ifdef ASSETS_DIR
+   if (path_is_directory(ASSETS_DIR "/assets"))
+      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
+            ASSETS_DIR,
+            "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
+   else
+#endif
    if (path_is_directory("/usr/local/share/retroarch/assets"))
       fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
             "/usr/local/share/retroarch",
@@ -1804,6 +1811,13 @@ static void frontend_unix_get_env(int *argc,
    fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], base_path,
          "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
 #else
+#ifdef FILTERS_DIR
+   if (path_is_directory(FILTERS_DIR "/filters/audio"))
+      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER],
+            FILTERS_DIR,
+            "filters/audio", sizeof(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER]));
+   else
+#endif
    if (path_is_directory("/usr/local/share/retroarch/filters/audio"))
       fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER],
             "/usr/local/share/retroarch",
@@ -1824,6 +1838,13 @@ static void frontend_unix_get_env(int *argc,
       fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER], base_path,
             "filters/audio", sizeof(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER]));
 
+#ifdef FILTERS_DIR
+   if (path_is_directory(FILTERS_DIR "/filters/video"))
+      fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
+            FILTERS_DIR,
+            "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
+   else
+#endif
    if (path_is_directory("/usr/local/share/retroarch/filters/video"))
       fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
             "/usr/local/share/retroarch",
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 715cfb1112..05824bfe42 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -13289,6 +13289,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                count++;
 
 #ifdef HAVE_COMPRESSION
+#ifdef HAVE_UPDATE_CORE_INFO
             if (settings->bools.menu_show_core_updater)
             {
                if (menu_entries_append(info->list,
@@ -13298,6 +13299,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         MENU_SETTING_ACTION, 0, 0, NULL))
                   count++;
             }
+#endif
 
 #ifdef HAVE_UPDATE_ASSETS
             if (menu_entries_append(info->list,
diff --git a/qb/config.params.sh b/qb/config.params.sh
index bfa7909c16..774b8e55eb 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -1,5 +1,6 @@
 HAVE_LIBRETRO=             # Libretro library used
 HAVE_ASSETS_DIR=           # Assets install directory
+HAVE_FILTERS_DIR=          # Audio/video filters directory
 HAVE_CORE_INFO_CACHE=yes   # Core info cache support
 HAVE_BLUETOOTH=no          # Bluetooth support
 HAVE_NVDA=yes              # NVDA support
@@ -141,7 +142,8 @@ HAVE_FLAC=auto             # Compile in flac support
 HAVE_DR_MP3=yes            # Compile in Dr. MP3 support
 HAVE_BUILTINFLAC=auto      # Bake in flac support
 HAVE_ONLINE_UPDATER=yes    # Disable the online updater
-HAVE_UPDATE_CORES=yes      # Disable downloading cores  with online updater
+HAVE_UPDATE_CORES=yes      # Disable downloading cores with online updater
+HAVE_UPDATE_CORE_INFO=yes  # Disable downloading cores info with online updater
 HAVE_UPDATE_ASSETS=yes     # Disable downloading assets with online updater
 HAVE_PRESERVE_DYLIB=no     # Enable dlclose() for Valgrind support
 HAVE_PARPORT=auto          # Parallel port joypad support