diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 387b88087d0..c63fb1cf703 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2006/09/25 22:16:30 steven Exp $
+# $OpenBSD: Makefile,v 1.10 2006/09/30 12:45:16 steven Exp $
 
 COMMENT=	"graphical multiplayer 3-d tank war game"
 DISTNAME=	bzflag-2.0.8
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}
 
diff --git a/games/bzflag/patches/patch-configure_ac b/games/bzflag/patches/patch-configure_ac
index 6585d9b8d00..811e47e45a1 100644
--- a/games/bzflag/patches/patch-configure_ac
+++ b/games/bzflag/patches/patch-configure_ac
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure_ac,v 1.2 2006/09/23 13:54:09 kurt Exp $
+$OpenBSD: patch-configure_ac,v 1.3 2006/09/30 12:45:16 steven Exp $
 --- configure.ac.orig	Mon Apr 17 16:11:11 2006
 +++ configure.ac	Sat Sep 23 09:43:43 2006
 @@ -73,12 +73,12 @@ AC_PROG_MAKE_SET
@@ -20,15 +20,6 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/09/23 13:54:09 kurt Exp $
  
  AC_CHECK_TOOL(WINDRES, windres, :)
  
-@@ -125,7 +125,7 @@ AC_SUBST(AR)
- AC_CHECK_PROG(AR, ar, ar)
- AC_SUBST(AR_FLAGS)
- 
--AC_CHECK_LIB(z, compress, BUILDZLIB=no, BUILDZLIB=yes)
-+AC_CHECK_LIB(z, compress, BUILDZLIB=yes, BUILDZLIB=yes)
- AM_CONDITIONAL(BUILDZLIB, test $BUILDZLIB = yes)
- 
-   #checking for libcurl library
 @@ -187,6 +187,7 @@ AC_CHECK_HEADERS( \
  	SDL/SDL.h \
  	X11/Xlib.h \
diff --git a/games/bzflag/patches/patch-src_bzflag_WorldBuilder_cxx b/games/bzflag/patches/patch-src_bzflag_WorldBuilder_cxx
new file mode 100644
index 00000000000..7921fd727c1
--- /dev/null
+++ b/games/bzflag/patches/patch-src_bzflag_WorldBuilder_cxx
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_bzflag_WorldBuilder_cxx,v 1.1 2006/09/30 12:45:16 steven Exp $
+--- src/bzflag/WorldBuilder.cxx.orig	Fri Sep 22 13:11:38 2006
++++ src/bzflag/WorldBuilder.cxx	Fri Sep 22 13:11:49 2006
+@@ -24,7 +24,7 @@
+ #include "BaseBuilding.h"
+ 
+ /* compression library header */
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ 
+ WorldBuilder::WorldBuilder()
diff --git a/games/bzflag/patches/patch-src_bzflag_clientCommands_cxx b/games/bzflag/patches/patch-src_bzflag_clientCommands_cxx
new file mode 100644
index 00000000000..56bee239beb
--- /dev/null
+++ b/games/bzflag/patches/patch-src_bzflag_clientCommands_cxx
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_bzflag_clientCommands_cxx,v 1.1 2006/09/30 12:45:16 steven Exp $
+--- src/bzflag/clientCommands.cxx.orig	Fri Sep 22 13:12:01 2006
++++ src/bzflag/clientCommands.cxx	Fri Sep 22 13:12:19 2006
+@@ -14,8 +14,7 @@
+ #include "commands.h"
+ 
+ /* system implementation headers */
+-#include "../zlib/zconf.h"
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ /* common implementation headers */
+ #include "BZDBCache.h"
diff --git a/games/bzflag/patches/patch-src_bzfs_WorldInfo_cxx b/games/bzflag/patches/patch-src_bzfs_WorldInfo_cxx
new file mode 100644
index 00000000000..68bb99419e2
--- /dev/null
+++ b/games/bzflag/patches/patch-src_bzfs_WorldInfo_cxx
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_bzfs_WorldInfo_cxx,v 1.1 2006/09/30 12:45:16 steven Exp $
+--- src/bzfs/WorldInfo.cxx.orig	Fri Sep 22 13:10:43 2006
++++ src/bzfs/WorldInfo.cxx	Fri Sep 22 13:11:01 2006
+@@ -51,7 +51,7 @@
+ #include "CustomZone.h"
+ 
+ /* compression library header */
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ 
+ WorldInfo::WorldInfo() :
diff --git a/games/bzflag/patches/patch-src_mediafile_PNGImageFile_cxx b/games/bzflag/patches/patch-src_mediafile_PNGImageFile_cxx
new file mode 100644
index 00000000000..4b0b9f96c99
--- /dev/null
+++ b/games/bzflag/patches/patch-src_mediafile_PNGImageFile_cxx
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_mediafile_PNGImageFile_cxx,v 1.1 2006/09/30 12:45:16 steven Exp $
+--- src/mediafile/PNGImageFile.cxx.orig	Fri Sep 22 13:10:00 2006
++++ src/mediafile/PNGImageFile.cxx	Fri Sep 22 13:10:11 2006
+@@ -15,8 +15,7 @@
+ #include <iostream>
+ #include "Pack.h"
+ #include "bzfio.h"
+-#include "../zlib/zconf.h"
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ #ifndef _WIN32
+ #include <netinet/in.h>