diff --git a/source/cl_main.c b/source/cl_main.c
index 5d1a5e1..38baf29 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -1606,6 +1606,10 @@ void Host_Init (void)
 	Cmd_Exec_File (fs_globalcfg->string);
 	Cbuf_Execute_Sets ();
 
+	// execute +set again to override the config file
+	Cmd_StuffCmds_f ();
+	Cbuf_Execute_Sets ();
+
 	CL_Cam_Init_Cvars ();
 	CL_Input_Init_Cvars ();
 	CL_Init_Cvars ();
diff --git a/source/sv_main.c b/source/sv_main.c
index dd40c0e..932fe18 100644
--- a/source/sv_main.c
+++ b/source/sv_main.c
@@ -1845,8 +1845,10 @@ SV_Init (void)
 	fs_globalcfg = Cvar_Get ("fs_globalcfg", FS_GLOBALCFG,
 							 CVAR_ROM, "global configuration file");
 	Cmd_Exec_File (fs_globalcfg->string);
+	Cbuf_Execute_Sets ();
 
-	// execute sets again after the config file has been parsed ..
+	// execute +set again to override the config file
+	Cmd_StuffCmds_f ();
 	Cbuf_Execute_Sets ();
 
 	COM_Filesystem_Init_Cvars ();