diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 28b7dfb092e..774c821ec71 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2001/11/23 21:35:18 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.3 2001/12/28 21:51:08 pvalchev Exp $
 
 COMMENT=	"burgertime clone for X"
 
-VERSION=	1.5
+VERSION=	1.6
 DISTNAME=	burgerspace-${VERSION}
 CATEGORIES=	games
-NEED_VERSION=	1.433
+NEED_VERSION=	1.502
 
 HOMEPAGE=	http://www3.sympatico.ca/sarrazip/dev/burgerspace.html
 
@@ -16,16 +16,13 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-#MASTER_SITES=	http://sites.netscape.net/sarrazip/
-MASTER_SITES=	${MASTER_SITE_BACKUP}
+MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
-LIB_DEPENDS=	gengameng.3.0:gengameng-*:devel/gengameng
+BUILD_DEPENDS=	automake::devel/automake
+LIB_DEPENDS=	gengameng.4.0::devel/gengameng
 
 USE_X11=	Yes
 
-SEPARATE_BUILD=	concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_STYLE= autoconf
 
 .include <bsd.port.mk>
diff --git a/games/burgerspace/distinfo b/games/burgerspace/distinfo
new file mode 100644
index 00000000000..b634d405dab
--- /dev/null
+++ b/games/burgerspace/distinfo
@@ -0,0 +1,3 @@
+MD5 (burgerspace-1.6.tar.gz) = 637e465cf1d5a2242b92b56f1526e960
+RMD160 (burgerspace-1.6.tar.gz) = a45a8dd8c7a9dce2f8e2ac51d9258875833b7def
+SHA1 (burgerspace-1.6.tar.gz) = 1871206108fe337a100e5c6dd3f7c061b1da01d7
diff --git a/games/burgerspace/files/md5 b/games/burgerspace/files/md5
deleted file mode 100644
index 39f791ce500..00000000000
--- a/games/burgerspace/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (burgerspace-1.5.tar.gz) = ce624d338cad7ae7e6fba45d63eaeb30
-RMD160 (burgerspace-1.5.tar.gz) = b69058417b303992de9e6283cbfd23b41d1a19bf
-SHA1 (burgerspace-1.5.tar.gz) = 63ace2454d15fabb59468925df4ffcae57b30501
diff --git a/games/burgerspace/patches/patch-aclocal_m4 b/games/burgerspace/patches/patch-aclocal_m4
new file mode 100644
index 00000000000..0c3ac8456f7
--- /dev/null
+++ b/games/burgerspace/patches/patch-aclocal_m4
@@ -0,0 +1,12 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2001/12/28 21:51:08 pvalchev Exp $
+--- aclocal.m4.orig	Sun Nov 25 12:28:58 2001
++++ aclocal.m4	Fri Dec 28 14:32:55 2001
+@@ -109,8 +109,6 @@ dnl	will be used.  The default is "c++".
+ 
+ AC_DEFUN([WITH_CXX],
+ [
+-	CXXFLAGS="-g -Wall"  # default compilation options
+-
+ 	AC_ARG_WITH(cxx,
+ 	[  --with-cxx=PROG               Specify program to use as C++ compiler [c++]],
+ 	[
diff --git a/games/burgerspace/patches/patch-configure_in b/games/burgerspace/patches/patch-configure_in
new file mode 100644
index 00000000000..34dfb3d98a6
--- /dev/null
+++ b/games/burgerspace/patches/patch-configure_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure_in,v 1.1 2001/12/28 21:51:08 pvalchev Exp $
+--- configure.in.orig	Fri Dec 28 14:36:12 2001
++++ configure.in	Fri Dec 28 14:36:05 2001
+@@ -18,8 +18,6 @@ WITH_CXX  # see macros/with-cxx.m4
+ AC_PROG_CXX
+ AC_LANG_CPLUSPLUS
+ 
+-CXXFLAGS="-g -Wall"
+-
+ 
+ # Checks for libraries.
+ 
diff --git a/games/burgerspace/patches/patch-src_Makefile_in b/games/burgerspace/patches/patch-src_Makefile_in
deleted file mode 100644
index ea89443dec8..00000000000
--- a/games/burgerspace/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2001/08/07 05:13:34 pvalchev Exp $
---- src/Makefile.in.orig	Fri Apr 27 17:18:48 2001
-+++ src/Makefile.in	Sun Aug  5 01:46:26 2001
-@@ -84,7 +84,7 @@ burgerspace_SOURCES =  	BurgerSpaceEngin
- 
- INCLUDES = @GENGAMENG_CFLAGS@
- 
--CXXFLAGS = -g -Wall
-+CXXFLAGS ?= -g -Wall
- 
- gnomedesktopentrydir = $(prefix)/share/gnome/apps/Games
- gnomedesktopentry_DATA = burgerspace.desktop
diff --git a/games/burgerspace/patches/patch-src_sdlmain_cc b/games/burgerspace/patches/patch-src_sdlmain_cpp
similarity index 75%
rename from games/burgerspace/patches/patch-src_sdlmain_cc
rename to games/burgerspace/patches/patch-src_sdlmain_cpp
index c343a1ec419..85d825b07a1 100644
--- a/games/burgerspace/patches/patch-src_sdlmain_cc
+++ b/games/burgerspace/patches/patch-src_sdlmain_cpp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_sdlmain_cc,v 1.1.1.1 2001/08/07 05:13:34 pvalchev Exp $
---- src/sdlmain.cc.orig	Fri Apr 27 14:51:46 2001
-+++ src/sdlmain.cc	Mon Aug  6 22:08:25 2001
+$OpenBSD: patch-src_sdlmain_cpp,v 1.1 2001/12/28 21:51:08 pvalchev Exp $
+--- src/sdlmain.cpp.orig	Fri Nov 23 22:12:36 2001
++++ src/sdlmain.cpp	Fri Dec 28 14:32:32 2001
 @@ -26,8 +26,22 @@
  #include <errno.h>
  #include <time.h>