diff --git a/config.features.h b/config.features.h
index 58f5b891bd..15cd85cf16 100644
--- a/config.features.h
+++ b/config.features.h
@@ -38,6 +38,12 @@ static const bool _network_gamepad_supp = true;
 static const bool _network_gamepad_supp = false;
 #endif
 
+#ifdef HAVE_FILTERS_BUILTIN
+static const bool _cpu_filters = true;
+#else
+static const bool _cpu_filters = false;
+#endif
+
 #ifdef HAVE_LIBUSB
 static const bool _libusb_supp = true;
 #else
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 3d247a828d..22ba4475ec 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -1799,9 +1799,9 @@ static void frontend_linux_get_env(int *argc,
             fill_pathname_join(g_defaults.dir.autoconfig,
                   app_dir, "autoconfig", sizeof(g_defaults.dir.autoconfig));
             fill_pathname_join(g_defaults.dir.audio_filter,
-                  app_dir, "audio_filters", sizeof(g_defaults.dir.audio_filter));
+                  app_dir, "filters/audio", sizeof(g_defaults.dir.audio_filter));
             fill_pathname_join(g_defaults.dir.video_filter,
-                  app_dir, "video_filters", sizeof(g_defaults.dir.video_filter));
+                  app_dir, "filters/video", sizeof(g_defaults.dir.video_filter));
             strlcpy(g_defaults.dir.content_history,
                   app_dir, sizeof(g_defaults.dir.content_history));
             fill_pathname_join(g_defaults.dir.database,