diff --git a/games/zatacka/Makefile b/games/zatacka/Makefile
index 583d9c5dce27..d31e110c90f8 100644
--- a/games/zatacka/Makefile
+++ b/games/zatacka/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zatacka
-PORTVERSION=	0.1.7
+PORTVERSION=	0.1.8
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -17,34 +17,12 @@ COMMENT=	Nibbles-like multiplayer game
 USE_SDL=	sdl ttf image
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/zatacka
-MAKE_ARGS=	CXX=${CXX}
-
-PORTDOCS=	README
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|font.ttf|${DATADIR}/font.ttf|' ${WRKSRC}/fx.h
-	@${REINPLACE_CMD} -e 's|barrier.jpg|${DATADIR}/barrier.jpg|' \
-		${WRKSRC}/fx.cpp
-	@${REINPLACE_CMD} -e 's|main_screen.jpg|${DATADIR}/main_screen.jpg|' \
-		${WRKSRC}/fx.cpp
-	@${REINPLACE_CMD} -e 's|maps/|${DATADIR}/maps/|' ${WRKSRC}/fx.cpp
-	@${REINPLACE_CMD} -e '/opendir/ s|maps|${DATADIR}/maps|' ${WRKSRC}/fx.cpp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/main_screen.jpg ${WRKSRC}/barrier.jpg \
-		${WRKSRC}/font.ttf ${DATADIR}
-	${MKDIR} ${DATADIR}/maps
-	${INSTALL_DATA} ${WRKSRC}/maps/*.jpg ${DATADIR}/maps
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	@${REINPLACE_CMD} -e 's|DATADIR|"${DATADIR}"|' ${WRKSRC}/src/main.cpp
 
 .include <bsd.port.mk>
diff --git a/games/zatacka/distinfo b/games/zatacka/distinfo
index 7885972f8dea..93c029bb17ec 100644
--- a/games/zatacka/distinfo
+++ b/games/zatacka/distinfo
@@ -1,3 +1,3 @@
-MD5 (zatacka-0.1.7_src.tar.gz) = c625408883bbaa88e57acfd54cfdb7fd
-SHA256 (zatacka-0.1.7_src.tar.gz) = a4aaec1c2207e2a925cf3f3742fdaf683ab5342bef95780178b376afa59e1491
-SIZE (zatacka-0.1.7_src.tar.gz) = 226064
+MD5 (zatacka-0.1.8_src.tar.gz) = d7a4019b7dbd25da9c513d0c9d4b8ae8
+SHA256 (zatacka-0.1.8_src.tar.gz) = 9eb8263dbec805cf0a6564b15269347f30dd2db094f47ed9e0d2710d1fbc3848
+SIZE (zatacka-0.1.8_src.tar.gz) = 397999
diff --git a/games/zatacka/files/patch-Makefile b/games/zatacka/files/patch-Makefile
deleted file mode 100644
index ff6ce332980d..000000000000
--- a/games/zatacka/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	Wed Mar 29 00:08:50 2006
-+++ Makefile	Sun Jun 11 15:42:44 2006
-@@ -2,7 +2,7 @@
- #Copyright by Mage 2006
- rm=/bin/rm -f
- ln=/bin/ln -s
--CC= g++ 
-+CXX?= g++ 
- DEFS=  
- PROGNAME= zatacka
- INCLUDES=  -I. 
-@@ -13,7 +13,7 @@
- 
- 
- DEFINES= $(INCLUDES) $(DEFS) -DSYS_UNIX=1
--CFLAGS= -g $(DEFINES) `sdl-config --cflags`
-+CXXFLAGS+= $(DEFINES) `sdl-config --cflags`
- 
- SRCS = main.cpp fx.cpp SDL_prim.c 
- 
-@@ -21,12 +21,12 @@
- 
- .c.o:
- 	$(rm) $@
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CXX) $(CXXFLAGS) -c $*.c
- 
- all: $(PROGNAME)
- 
- $(PROGNAME) : $(OBJS)
--	$(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
-+	$(CXX) $(CXXFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
- 
- clean:
- 	$(rm) $(OBJS) $(PROGNAME) core *~
diff --git a/games/zatacka/files/patch-fx.cpp b/games/zatacka/files/patch-fx.cpp
deleted file mode 100644
index 0e09b32ad296..000000000000
--- a/games/zatacka/files/patch-fx.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- fx.cpp.orig	Mon Mar 27 00:43:47 2006
-+++ fx.cpp	Mon Mar 27 00:47:47 2006
-@@ -46,8 +46,6 @@
- 	int i;
- 	char* wd;
- 
--	wd=GetAppPath(); //get path to aplication directory
--	chdir(wd); //change working directory to aplication directory
- 
- 	if((SDL_Init(SDL_INIT_VIDEO ))==-1){ //initialize SDL library
- 		disperr("Error initializing SDL");
diff --git a/games/zatacka/pkg-plist b/games/zatacka/pkg-plist
index 7b3a1338d1f5..1e81de6e230e 100644
--- a/games/zatacka/pkg-plist
+++ b/games/zatacka/pkg-plist
@@ -1,7 +1,7 @@
 bin/zatacka
+%%DATADIR%%/README
 %%DATADIR%%/barrier.jpg
 %%DATADIR%%/font.ttf
 %%DATADIR%%/main_screen.jpg
-%%DATADIR%%/maps/map1.jpg
-@dirrm %%DATADIR%%/maps
+%%DATADIR%%/map1.jpg
 @dirrm %%DATADIR%%