diff --git a/quake3-1.34-rc4-demo-pak.patch b/quake3-1.34-rc4-demo-pak.patch
new file mode 100644
index 0000000..8488631
--- /dev/null
+++ b/quake3-1.34-rc4-demo-pak.patch
@@ -0,0 +1,25 @@
+diff -up quake3-1.34-rc4/code/qcommon/files.c~ quake3-1.34-rc4/code/qcommon/files.c
+--- quake3-1.34-rc4/code/qcommon/files.c~	2008-01-17 10:46:50.000000000 +0100
++++ quake3-1.34-rc4/code/qcommon/files.c	2008-01-17 10:46:50.000000000 +0100
+@@ -2916,19 +2916,17 @@ 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') {
diff --git a/quake3.spec b/quake3.spec
index 06a1dac..6774eeb 100644
--- a/quake3.spec
+++ b/quake3.spec
@@ -2,7 +2,7 @@
 
 Name:           quake3
 Version:        1.34
-Release:        0.7.%{prever}%{?dist}
+Release:        0.8.%{prever}%{?dist}
 Summary:        Quake 3 Arena engine (ioquake3 version)
 Group:          Amusements/Games
 License:        GPLv2+
@@ -36,6 +36,7 @@ Patch1:         quake3-1.34-configurable-client-masterserver.patch
 Patch2:         quake3-1.34-fix-empty-fs_game-from-server.patch
 Patch3:         quake3-1.34-dont-ask-openarena-cdkey.patch
 Patch4:         quake3-1.34-no-pak0-check.patch
+Patch5:         quake3-1.34-rc4-demo-pak.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libXt-devel openal-devel libjpeg-devel
 BuildRequires:  libvorbis-devel curl-devel desktop-file-utils
@@ -137,6 +138,7 @@ Padman menu entry, which will automatically download the necessary datafiles
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -269,6 +271,10 @@ fi
 
 
 %changelog
+* Thu Jan 17 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.34-0.8.rc4
+- Properly recognize the demo pak0 file instead of complaining that no valid
+  pak0 was found
+
 * Fri Jan 11 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.34-0.7.rc4
 - Various patches to make openarena work with the generic ioquake3 we ship
 - Update urbanterror launcher script to set a much bigger com_hunkMegs,