diff --git a/acconfig.h b/acconfig.h
index 16d5676..50c462a 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -5,6 +5,9 @@
 /* Define if you want to use QF-style defaults instead of Id-style */
 #undef NEWSTYLE
 
+/* Define this to the subdirectory name of the default game */
+#undef GAMENAME
+
 /* Define if you have the XFree86 DGA extension */
 #undef HAS_DGA
 
@@ -32,11 +35,3 @@
 /* Define this to use experimental code */
 #undef _EXPERIMENTAL_
 
-#if defined(X11)
-#   define OUTPUT_STR	"X11"
-#elif defined(GGI)
-#   define OUTPUT_STR	"GGI"
-#else
-#   define OUTPUT_STR	"Unknown"
-#endif
-
diff --git a/configure.in b/configure.in
index a1307fd..ffead38 100644
--- a/configure.in
+++ b/configure.in
@@ -68,6 +68,9 @@ AC_ARG_ENABLE(newstyle,
 )
 if test "x$NEWSTYLE" = xyes; then
    AC_DEFINE(NEWSTYLE)
+   AC_DEFINE(GAMENAME, "base")
+else
+   AC_DEFINE(GAMENAME, "id1")
 fi
 
 AC_ARG_ENABLE(release,
diff --git a/qw_common/common.c b/qw_common/common.c
index 750a0d1..2088bcd 100644
--- a/qw_common/common.c
+++ b/qw_common/common.c
@@ -1711,7 +1711,7 @@ void COM_Gamedir (char *dir)
 	//
 	Cache_Flush ();
 
-	if (!strcmp(dir,"id1") || !strcmp(dir, "qw"))
+	if (!strcmp(dir, GAMENAME) || !strcmp(dir, "qw"))
 		return;
 
 	snprintf(com_gamedir, sizeof(com_gamedir), "%s/%s", com_basedir, dir);
@@ -1751,7 +1751,7 @@ void COM_InitFilesystem (void)
 
 //
 // -basedir <path>
-// Overrides the system supplied base directory (under id1)
+// Overrides the system supplied base directory
 //
 	i = COM_CheckParm ("-basedir");
 	if (i && i < com_argc-1)
@@ -1760,9 +1760,9 @@ void COM_InitFilesystem (void)
 		strcpy (com_basedir, host_parms.basedir);
 
 //
-// start up with id1 by default
+// start up with GAMENAME by default
 //
-	COM_AddGameDirectory (va("%s/id1", 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
diff --git a/qw_server/sv_user.c b/qw_server/sv_user.c
index aa27d71..d4c7a1f 100644
--- a/qw_server/sv_user.c
+++ b/qw_server/sv_user.c
@@ -1402,6 +1402,7 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean inside)
 
 		host_client->msec_pool += idealmsec - oldmsec;
 
+#if 0
 		if (abs(host_client->msec_pool) > POOLMAX)
 		{
 			printf("tmp_t: %f, realt: %f, frame_t: %f, loss: %d, total: %d\n",
@@ -1423,7 +1424,8 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean inside)
 			printf("oldmsec: %d, msec: %d, pool: %d\n", oldmsec, 
 					idealmsec, host_client->msec_pool);
 		}
-		
+#endif
+
 		if (abs(host_client->msec_pool) > POOLMAX)
 		{
 			/* if our pool exceeds POOLMAX msec, empty it into msec.  This
diff --git a/qw_server/sys_unix.c b/qw_server/sys_unix.c
index ea0c7d9..aab72d9 100644
--- a/qw_server/sys_unix.c
+++ b/qw_server/sys_unix.c
@@ -154,12 +154,6 @@ int main(int argc, char *argv[])
 
 	parms.basedir = ".";
 
-/*
-	if (Sys_FileTime ("id1/pak0.pak") != -1)
-	else
-		parms.basedir = "/raid/quake/v2";
-*/
-
 	SV_Init (&parms);
 
 // run one frame immediately for first heartbeat
diff --git a/uquake/common.c b/uquake/common.c
index e15baab..d7ca99f 100644
--- a/uquake/common.c
+++ b/uquake/common.c
@@ -1692,7 +1692,7 @@ void COM_InitFilesystem (void)
 		com_cachedir[0] = 0;
 
 //
-// start up with GAMENAME by default (id1)
+// start up with GAMENAME by default
 //
 	COM_AddGameDirectory (va("%s/"GAMENAME, basedir) );
 
diff --git a/uquake/quakedef.h b/uquake/quakedef.h
index f934c4d..37d1185 100644
--- a/uquake/quakedef.h
+++ b/uquake/quakedef.h
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef _UQUAKE_QUAKEDEF_H
 #define _UQUAKE_QUAKEDEF_H
 
-#define	GAMENAME	"id1"		// directory to look in by default
-
 #if defined(_WIN32) && !defined(WINDED)
 #if defined(_M_IX86)
 #define __i386__	1