diff -up quake3-1.34-rc4/code/qcommon/files.c.foobar quake3-1.34-rc4/code/qcommon/files.c
--- quake3-1.34-rc4/code/qcommon/files.c.foobar	2009-01-27 09:56:46.000000000 +0100
+++ quake3-1.34-rc4/code/qcommon/files.c	2009-01-27 09:57:29.000000000 +0100
@@ -2917,18 +2917,16 @@ static void FS_CheckPak0( void )
 		if(!path->pack)
 			continue;
 
-		if(!Q_stricmpn( path->pack->pakGamename, "demoq3", MAX_OSPATH )
-		&& !Q_stricmpn( pakBasename, "pak0", MAX_OSPATH )) {
+		if(!Q_stricmpn( pakBasename, "pak0", MAX_OSPATH ) &&
+		   path->pack->checksum == DEMO_PAK0_CHECKSUM ) {
 			founddemo = qtrue;
 
-			if( path->pack->checksum == DEMO_PAK0_CHECKSUM ) {
 				Com_Printf( "\n\n"
 						"**************************************************\n"
 						"WARNING: It looks like you're using pak0.pk3\n"
 						"from the demo. This may work fine, but it is not\n"
 						"guaranteed or supported.\n"
 						"**************************************************\n\n\n" );
-			}
 		} else if(!Q_stricmpn( path->pack->pakGamename, BASEGAME, MAX_OSPATH )
 		&& strlen(pakBasename) == 4 && !Q_stricmpn( pakBasename, "pak", 3 )
 		&& pakBasename[3] >= '0' && pakBasename[3] <= '8') {