diff --git a/AUTHORS b/AUTHORS
index 58babc4..9ca8801 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -161,3 +161,7 @@ N: Andrew "Slade" Alexander
 E: slade@quakelives.com
 D: Reworking of the heart beat, and ping taking code on the server side.
 D: sv_maxrate support..
+
+A: Nye "nyet" Liu
+E: nyet@nbase.com
+D: game dir fixes
diff --git a/CREDITS b/CREDITS
index 5a61f48..3660470 100644
--- a/CREDITS
+++ b/CREDITS
@@ -90,6 +90,7 @@ Misc Code Fixes:
   Dan Nelson <dnelson@emsphone.com> -- Typo fix..
   Dan Olson <theoddone@quakefiles.com>
   David Symonds <xoxus@usa.net> some warnings
+  Nye Liu <nyet@nbase.com> game dir fixes
 
 Cheat/exploit fixes:
   Mads Bondo Dydensborg <madsdyd@challenge.dk>
diff --git a/qw_common/common.c b/qw_common/common.c
index 2088bcd..5d2d6e4 100644
--- a/qw_common/common.c
+++ b/qw_common/common.c
@@ -1637,7 +1637,7 @@ void COM_AddGameDirectory (char *dir)
 	if ((p = strrchr(dir, '/')) != NULL)
 		strcpy(gamedirfile, ++p);
 	else
-		strcpy(gamedirfile, p);
+		strcpy(gamedirfile, dir);
 	strcpy (com_gamedir, dir);
 
 //
@@ -1762,7 +1762,7 @@ void COM_InitFilesystem (void)
 //
 // start up with GAMENAME by default
 //
-	COM_AddGameDirectory (va("%s" GAMENAME, com_basedir) );
+	COM_AddGameDirectory (va("%s/" GAMENAME, com_basedir) );
 	COM_AddGameDirectory (va("%s/qw", com_basedir) );
 
 	// any set gamedirs will be freed up to here