diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index d3bb0894..41cbbc0f 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2537,7 +2537,7 @@ void Com_Init( char *commandLine ) {
 
 	// skip the q3config.cfg if "safe" is on the command line
 	if ( !Com_SafeMode() ) {
-		Cbuf_AddText ("exec q3config.cfg\n");
+		Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
 	}
 
 	Cbuf_AddText ("exec autoexec.cfg\n");
@@ -2690,7 +2690,7 @@ void Com_WriteConfiguration( void ) {
 	}
 	cvar_modifiedFlags &= ~CVAR_ARCHIVE;
 
-	Com_WriteConfigToFile( "q3config.cfg" );
+	Com_WriteConfigToFile( Q3CONFIG_CFG );
 
 	// not needed for dedicated
 #ifndef DEDICATED
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index 5d199165..ba502220 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -3317,7 +3317,7 @@ void FS_Restart( int checksumFeed ) {
 	if ( Q_stricmp(fs_gamedirvar->string, lastValidGame) ) {
 		// skip the q3config.cfg if "safe" is on the command line
 		if ( !Com_SafeMode() ) {
-			Cbuf_AddText ("exec q3config.cfg\n");
+			Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
 		}
 	}
 
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 33d3d9ee..817bbab9 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -536,6 +536,12 @@ issues.
 
 #define	MAX_FILE_HANDLES	64
 
+#ifdef DEDICATED
+#	define Q3CONFIG_CFG "q3config_server.cfg"
+#else
+#	define Q3CONFIG_CFG "q3config.cfg"
+#endif
+
 qboolean FS_Initialized( void );
 
 void	FS_InitFilesystem ( void );