diff --git a/retroarch.cfg b/retroarch.cfg
index e18b750862..a97ef26009 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -59,6 +59,9 @@
 # Overwrites the config. #include's and comments are not preserved.
 # config_save_on_exit = false
 
+# Load up a specific config file based on the core being used.
+# core_specific_config = false
+
 #### Video
 
 # Video driver to use. "gl", "xvideo", "sdl"
diff --git a/settings.c b/settings.c
index 29e4142dba..ed798e5465 100644
--- a/settings.c
+++ b/settings.c
@@ -1277,6 +1277,8 @@ bool config_save_file(const char *path)
    for (i = 0; i < MAX_PLAYERS; i++)
       save_keybinds_player(conf, i);
 
+   config_set_bool(conf, "core_specific_config", g_settings.core_specific_config);
+
    bool ret = config_file_write(conf, path);
    config_file_free(conf);
    return ret;