diff --git a/games/quake2/Makefile b/games/quake2/Makefile
index c73465d1d74..1a40c3c7530 100644
--- a/games/quake2/Makefile
+++ b/games/quake2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/05/17 14:24:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2007/05/29 14:49:16 claudio Exp $
 
 ONLY_FOR_ARCHS= 	i386
 SHARED_ONLY=		Yes
@@ -6,7 +6,7 @@ SHARED_ONLY=		Yes
 COMMENT=		"first person shooter"
 
 DISTNAME=		quake2-0.3
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		games
 
 HOMEPAGE=		http://www.quakeforge.net/
diff --git a/games/quake2/patches/patch-data_baseq2_config_cfg b/games/quake2/patches/patch-data_baseq2_config_cfg
new file mode 100644
index 00000000000..44826aa2819
--- /dev/null
+++ b/games/quake2/patches/patch-data_baseq2_config_cfg
@@ -0,0 +1,15 @@
+$OpenBSD: patch-data_baseq2_config_cfg,v 1.1 2007/05/29 14:49:16 claudio Exp $
+--- data/baseq2/config.cfg.orig	Tue May 29 05:26:39 2007
++++ data/baseq2/config.cfg	Tue May 29 05:28:15 2007
+@@ -116,9 +116,9 @@ set hostname "noname"
+ set sndbits "16"
+ set sndspeed "0"
+ set sndchannels "2"
+-set snddevice "/dev/dsp"
++set snddevice "/dev/audio"
+ set cd_volume "1"
+-set cd_dev "/dev/cdrom"
++set cd_dev "/dev/rcd0c"
+ set cl_drawfps "1"
+ set in_dgamouse "1"
+ set vid_ref "softx"
diff --git a/games/quake2/patches/patch-src_snd_oss_c b/games/quake2/patches/patch-src_snd_oss_c
index 619b735b38a..8ff8d52b1e4 100644
--- a/games/quake2/patches/patch-src_snd_oss_c
+++ b/games/quake2/patches/patch-src_snd_oss_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_snd_oss_c,v 1.1.1.1 2007/03/16 18:26:01 claudio Exp $
---- src/snd_oss.c.orig	Sun Jan 22 00:12:42 2006
-+++ src/snd_oss.c	Sun Jan 22 00:14:14 2006
-@@ -358,7 +358,7 @@ qboolean SNDDMA_Init(struct sndinfo * s)
+$OpenBSD: patch-src_snd_oss_c,v 1.2 2007/05/29 14:49:16 claudio Exp $
+--- src/snd_oss.c.orig	Mon Mar 15 03:25:43 2004
++++ src/snd_oss.c	Tue May 29 05:20:07 2007
+@@ -358,7 +358,7 @@ qboolean SNDDMA_Init(struct sndinfo * s) {
  
  	if (!si->dma->buffer) {
  	    si->dma->buffer = (unsigned char *) mmap(NULL, info.fragstotal * info.fragsize,
diff --git a/games/quake2/patches/patch-src_snd_solaris_c b/games/quake2/patches/patch-src_snd_solaris_c
index 30b1a14b8cf..ee7b84889d8 100644
--- a/games/quake2/patches/patch-src_snd_solaris_c
+++ b/games/quake2/patches/patch-src_snd_solaris_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_snd_solaris_c,v 1.1.1.1 2007/03/16 18:26:01 claudio Exp $
---- src/snd_solaris.c.orig	Mon Mar 15 13:50:17 2004
-+++ src/snd_solaris.c	Sun Jan 22 00:04:45 2006
-@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place - Suit
+$OpenBSD: patch-src_snd_solaris_c,v 1.2 2007/05/29 14:49:16 claudio Exp $
+--- src/snd_solaris.c.orig	Mon Mar 15 13:50:39 2004
++++ src/snd_solaris.c	Tue May 29 05:20:07 2007
+@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  #include <unistd.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -108,7 +108,7 @@ $OpenBSD: patch-src_snd_solaris_c,v 1.1.1.1 2007/03/16 18:26:01 claudio Exp $
  	    close(audio_fd);
  	    audio_fd = -1;
  		}
-@@ -211,7 +210,7 @@ Send sound to device if buffer isn't rea
+@@ -211,7 +210,7 @@ Send sound to device if buffer isn't really the dma bu
  */
  void SNDDMA_Submit(void)
  {