diff --git a/source/cl_main.c b/source/cl_main.c
index 226c970..fee9922 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -1677,8 +1677,6 @@ void Host_Init (quakeparms_t *parms)
 {
 	COM_InitArgv (parms->argc, parms->argv);
 
-	Sys_mkdir("qw");
-
 	if (COM_CheckParm ("-minmemory"))
 		parms->memsize = MINIMUM_MEMORY;
 
diff --git a/source/quakefs.c b/source/quakefs.c
index fce8a95..d019824 100644
--- a/source/quakefs.c
+++ b/source/quakefs.c
@@ -325,6 +325,7 @@ COM_CreatePath ( char *path )
 			*ofs = '/';
 		}
 	}
+	Sys_mkdir (path);
 }
 
 
@@ -890,12 +891,18 @@ COM_InitFilesystem ( void )
 /*
 	start up with BASEGAME by default
 */
+	COM_CreatePath (va("%s/%s",fs_userpath->string,BASEGAME));
 	COM_AddGameDirectory (BASEGAME);
-	if (hipnotic)
+	if (hipnotic) {
+		COM_CreatePath (va("%s/%s",fs_userpath->string,"hipnotic"));
 		COM_AddGameDirectory ("hipnotic");
-	if (rogue)
+	}
+	if (rogue) {
+	  COM_CreatePath (va("%s/%s",fs_userpath->string,"rogue"));
 		COM_AddGameDirectory ("rogue");
+	}
 
+	COM_CreatePath (va("%s/qw",fs_userpath->string));
 	COM_AddGameDirectory ("qw");
 
 	// any set gamedirs will be freed up to here
diff --git a/source/sv_ccmds.c b/source/sv_ccmds.c
index 7e938a4..5efce5c 100644
--- a/source/sv_ccmds.c
+++ b/source/sv_ccmds.c
@@ -780,15 +780,15 @@ void SV_Snap (int uid)
 
 	sprintf(pcxname, "%d-00.pcx", uid);
 
-	snprintf (checkname, sizeof(checkname), "%s/snap", gamedirfile);
-	Sys_mkdir(gamedirfile);
+	snprintf (checkname, sizeof(checkname), "%s/snap", com_gamedir);
+	Sys_mkdir(com_gamedir);
 	Sys_mkdir(checkname);
 		
 	for (i=0 ; i<=99 ; i++) 
 	{ 
 		pcxname[strlen(pcxname) - 6] = i/10 + '0'; 
 		pcxname[strlen(pcxname) - 5] = i%10 + '0'; 
-		snprintf (checkname, sizeof(checkname), "%s/snap/%s", gamedirfile, pcxname);
+		snprintf (checkname, sizeof(checkname), "%s/snap/%s", com_gamedir, pcxname);
 		if (Sys_FileTime(checkname) == -1)
 			break;	// file doesn't exist
 	}