diff --git a/include/QF/progs.h b/include/QF/progs.h
index 0f0a2ce77..ae13ca71d 100644
--- a/include/QF/progs.h
+++ b/include/QF/progs.h
@@ -93,7 +93,8 @@ void PR_ExecuteProgram (progs_t *pr, func_t fnum);
 	to PR_ExecuteProgram().
 	\param pr pointer to progs_t VM struct
 	\param fnum number of the function to call
-	\return true if \c fnum was a progs function, false if fnum was a builtin
+	\return true if \c fnum was a progs function, false if \c fnum was a
+	builtin
 */
 int PR_CallFunction (progs_t *pr, func_t fnum);
 
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 8a7bd8b2d..67e327c6f 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -169,6 +169,30 @@ static const char *qfs_default_dirconf =
 	"		Inherit = (Quake);"
 	"		Path = \"$gamedir\";"
 	"	};"
+	"	\"hipnotic\" = {"
+	"		Inherit = (Quake);"
+	"		Path = \"hipnotic\";"
+	"	};"
+	"	\"hipnotic:*\" = {"
+	"		Inherit = (hipnotic);"
+	"		Path = \"$gamedir\";"
+	"	};"
+	"	\"rogue\" = {"
+	"		Inherit = (Quake);"
+	"		Path = \"rogue\";"
+	"	};"
+	"	\"rogue:*\" = {"
+	"		Inherit = (rogue);"
+	"		Path = \"$gamedir\";"
+	"	};"
+	"	\"abyss\" = {"
+	"		Inherit = (Quake);"
+	"		Path = \"abyss\";"
+	"	};"
+	"	\"abyss:*\" = {"
+	"		Inherit = (abyss);"
+	"		Path = \"$gamedir\";"
+	"	};"
 	"}";
 
 
diff --git a/nq/include/game.h b/nq/include/game.h
index 10c684f53..cf1fbebd4 100644
--- a/nq/include/game.h
+++ b/nq/include/game.h
@@ -162,6 +162,6 @@ extern qboolean		isDedicated;
 extern qboolean		abyss, rogue, hipnotic, standard_quake;
 extern struct cvar_s		*registered;
 
-void Game_Init (void);
+const char *Game_Init (void);
 
 #endif // __game_h
diff --git a/nq/source/game.c b/nq/source/game.c
index 35ff3e120..db44eaef7 100644
--- a/nq/source/game.c
+++ b/nq/source/game.c
@@ -39,7 +39,7 @@ qboolean standard_quake = false;
 qboolean hipnotic, rogue, abyss;
 
 
-void
+const char *
 Game_Init (void)
 {
 	int     i;
@@ -48,15 +48,17 @@ Game_Init (void)
 	standard_quake = true;
 
 	if ((i = COM_CheckParm ("-hipnotic"))) {
-		QFS_Gamedir ("hipnotic");
 		standard_quake = false;
 		hipnotic = true;
+		return "hipnotic";
 	} else if ((i = COM_CheckParm ("-rogue"))) {
-		QFS_Gamedir ("rogue");
 		standard_quake = false;
 		rogue = true;
+		return "rogue";
 	} else if ((i = COM_CheckParm ("-abyss"))) {
-		QFS_Gamedir ("abyss");
 		abyss = true;
+		return "abyss";
 	}
+
+	return "nq";
 }
diff --git a/nq/source/host.c b/nq/source/host.c
index d85afdc23..7834a485a 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -868,6 +868,8 @@ CL_Init_Memory (void)
 void
 Host_Init (void)
 {
+	const char *mp;
+
 	Con_Printf ("Host_Init\n");
 
 	host_cbuf = Cbuf_New (&id_interp);
@@ -913,7 +915,8 @@ Host_Init (void)
 
 	pr_gametype = "netquake";
 
-	QFS_Init ("nq");
+	mp = Game_Init ();
+	QFS_Init (mp);
 	PI_Init ();
 
 	Chase_Init_Cvars ();
@@ -934,7 +937,6 @@ Host_Init (void)
 	PR_Init ();
 
 	V_Init ();
-	Game_Init ();
 	COM_Init ();
 
 	if (isDedicated) {