diff --git a/games/vitetris/Makefile b/games/vitetris/Makefile
index f8b61ea559f..709c0f9cae8 100644
--- a/games/vitetris/Makefile
+++ b/games/vitetris/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/09/22 12:43:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2009/04/01 08:30:45 martin Exp $
 
 COMMENT =	terminal-based tetris clone in vein of nintendo tetris
 DISTNAME =	vitetris-0.51
+PKGNAME =	${DISTNAME}p0
 CATEGORIES =	games
 
 HOMEPAGE =	http://victornils.net/tetris/
diff --git a/games/vitetris/patches/patch-Makefile b/games/vitetris/patches/patch-Makefile
index 3446fbc469d..f75eb62d56c 100644
--- a/games/vitetris/patches/patch-Makefile
+++ b/games/vitetris/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2008/09/22 12:43:31 ajacoutot Exp $
+$OpenBSD: patch-Makefile,v 1.2 2009/04/01 08:30:45 martin Exp $
 --- Makefile.orig	Sat Sep 13 11:45:37 2008
-+++ Makefile	Mon Sep 22 09:31:15 2008
++++ Makefile	Mon Mar 30 20:59:06 2009
 @@ -1,11 +1,11 @@
  include config.mk
  
@@ -24,7 +24,8 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2008/09/22 12:43:31 ajacoutot Exp $
 +	cd src; $(MAKE) tetris
  	mv -f src/tetris$(EXE) $(PROGNAME)
  	@echo stripping symbols to reduce program size:
- 	-strip --strip-all $(PROGNAME)
+-	-strip --strip-all $(PROGNAME)
++	-strip $(PROGNAME)
  
  gameserver: src/netw/gameserver.c
 -	$(MAKE) -Csrc/netw gameserver
diff --git a/games/vitetris/patches/patch-src_draw_Makefile b/games/vitetris/patches/patch-src_draw_Makefile
new file mode 100644
index 00000000000..20fed0290c5
--- /dev/null
+++ b/games/vitetris/patches/patch-src_draw_Makefile
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_draw_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
+--- src/draw/Makefile.orig	Mon Mar 30 20:43:06 2009
++++ src/draw/Makefile	Mon Mar 30 20:43:29 2009
+@@ -4,7 +4,8 @@ OBJS = draw.o draw_menu.o draw2p.o draw2p_menu.o
+ HEADERS = draw.h internal.h ../textgfx/textgfx.h
+ 
+ draw.a: $(OBJS)
+-	ar rs draw.a $(OBJS)
++	ar r draw.a $(OBJS)
++	ranlib draw.a
+ 
+ draw.o: draw.c $(HEADERS) ../game/tetris.h ../hiscore.h \
+ 			  ../netw/sock.h ../src-conf.mk
diff --git a/games/vitetris/patches/patch-src_game_Makefile b/games/vitetris/patches/patch-src_game_Makefile
new file mode 100644
index 00000000000..666de5171e2
--- /dev/null
+++ b/games/vitetris/patches/patch-src_game_Makefile
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_game_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
+--- src/game/Makefile.orig	Mon Mar 30 20:46:27 2009
++++ src/game/Makefile	Mon Mar 30 20:45:11 2009
+@@ -4,7 +4,8 @@ OBJS = tetris.o $(tetris2p_obj) game.o wonlost.o
+ HEADERS = tetris.h ../timer.h ../input/input.h ../draw/draw.h
+ 
+ game.a: $(OBJS)
+-	ar rs game.a $(OBJS)
++	ar r game.a $(OBJS)
++	ranlib game.a
+ 
+ tetris.o: tetris.c $(HEADERS)
+ 	$(CC) $(CCFLAGS) -I..  -c tetris.c
diff --git a/games/vitetris/patches/patch-src_input_Makefile b/games/vitetris/patches/patch-src_input_Makefile
new file mode 100644
index 00000000000..63ac2479e1e
--- /dev/null
+++ b/games/vitetris/patches/patch-src_input_Makefile
@@ -0,0 +1,31 @@
+$OpenBSD: patch-src_input_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
+--- src/input/Makefile.orig	Mon Mar 30 20:48:17 2009
++++ src/input/Makefile	Mon Mar 30 20:49:08 2009
+@@ -6,19 +6,23 @@ default: $(BACKEND)
+ 
+ unixterm: $(OBJS) inp_unixterm.o escseq.o select.o $(joylinux_obj)
+ 	rm -f input.a
+-	ar rcs input.a $(OBJS) inp_unixterm.o escseq.o select.o $(joylinux_obj)
++	ar rc input.a $(OBJS) inp_unixterm.o escseq.o select.o $(joylinux_obj)
++	ranlib input.a
+ 
+ curses: $(OBJS) inp_curses.o $(joylinux_obj) $(select_obj)
+ 	rm -f input.a
+-	ar rcs input.a $(OBJS) inp_curses.o $(joylinux_obj) $(select_obj)
++	ar rc input.a $(OBJS) inp_curses.o $(joylinux_obj) $(select_obj)
++	ranlib input.a
+ 
+ conio: $(OBJS) inp_con.o
+ 	rm -f input.a
+-	ar rcs input.a $(OBJS) inp_con.o
++	ar rc input.a $(OBJS) inp_con.o
++	ranlib input.a
+ 
+ allegro: $(OBJS) inp_allegro.o $(select_obj)
+ 	rm -f input.a
+-	ar rcs input.a $(OBJS) inp_allegro.o $(select_obj)
++	ar rc input.a $(OBJS) inp_allegro.o $(select_obj)
++	ranlib input.a
+ 
+ input.o: input.c input.h keyboard.h joystick.h \
+ 	 ../timer.h ../draw/draw.h ../game/tetris.h ../netw/sock.h \
diff --git a/games/vitetris/patches/patch-src_menu_Makefile b/games/vitetris/patches/patch-src_menu_Makefile
new file mode 100644
index 00000000000..edb695e4b9a
--- /dev/null
+++ b/games/vitetris/patches/patch-src_menu_Makefile
@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_menu_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
+--- src/menu/Makefile.orig	Tue Sep  9 23:42:23 2008
++++ src/menu/Makefile	Mon Mar 30 20:54:27 2009
+@@ -11,11 +11,13 @@ HEADERS = menu.h ../input/input.h ../textgfx/textgfx.h
+ all: menu.a $(menuext_lib)
+ 
+ menu.a: $(OBJS)
+-	ar rs menu.a $(OBJS)
++	ar r menu.a $(OBJS)
++	ranlib menu.a
+ 
+ menuext.a: $(EXT_OBJS)
+ 	rm -f menuext.a
+-	ar rcs menuext.a $(EXT_OBJS)
++	ar rc menuext.a $(EXT_OBJS)
++	ranlib menuext.a
+ 
+ menucore.o: menucore.c $(HEADERS) ../src-conf.mk
+ 	$(CC) $(CCFLAGS) $(DNO_MENU) -c menucore.c 
diff --git a/games/vitetris/patches/patch-src_netw_Makefile b/games/vitetris/patches/patch-src_netw_Makefile
new file mode 100644
index 00000000000..6dca86b7be6
--- /dev/null
+++ b/games/vitetris/patches/patch-src_netw_Makefile
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_netw_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
+--- src/netw/Makefile.orig	Mon Mar 30 20:42:32 2009
++++ src/netw/Makefile	Mon Mar 30 20:42:52 2009
+@@ -6,7 +6,8 @@ config_h = ../config.h ../config2.h
+ all: $(netw_lib)
+ 
+ netw.a: $(OBJS) ../src-conf.mk
+-	ar rs netw.a $(OBJS)
++	ar r netw.a $(OBJS)
++	ranlib netw.a
+ 
+ socket.o: socket.c sock.h internal.h ../input/input.h ../timer.h $(config_h)
+ 
diff --git a/games/vitetris/patches/patch-src_textgfx_Makefile b/games/vitetris/patches/patch-src_textgfx_Makefile
new file mode 100644
index 00000000000..51e2835c6b8
--- /dev/null
+++ b/games/vitetris/patches/patch-src_textgfx_Makefile
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_textgfx_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
+--- src/textgfx/Makefile.orig	Mon Mar 30 20:49:59 2009
++++ src/textgfx/Makefile	Mon Mar 30 20:50:22 2009
+@@ -5,7 +5,8 @@ OBJS = block.o win.o print.o ibmgfx.o \
+ 
+ textgfx.a: $(OBJS)
+ 	rm -f textgfx.a
+-	ar rcs textgfx.a $(OBJS)
++	ar rc textgfx.a $(OBJS)
++	ranlib textgfx.a
+ 
+ term.o: term.c textgfx.h ../options.h ../config.h
+ 	$(CC) $(CCFLAGS) -I.. -c term.c