diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index ed55fac105b..582983f8950 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,11 +1,26 @@
-# $OpenBSD: Makefile,v 1.5 1999/03/31 07:12:14 marc Exp $
+# $OpenBSD: Makefile,v 1.6 1999/04/30 20:28:32 brad Exp $
 
-PKGNAME=	abuse
-CATEGORIES=	games
+DISTNAME=	abuse-2.0
+CATEGORIES=	games x11
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://ftp.NetBSD.ORG/pub/NetBSD/packages/distfiles/
+MASTER_SITE_SUBDIR= abuse
+DISTFILES=	${DISTNAME}.tar.gz abuse_data.tar.gz
+HOMEPAGE=	http://www.crack.com/games/abuse/
 
-BROKEN=		"newer version available"
-MIRROR_DISTFILE=	no
+MAINTAINER=	rohee@openbsd.org
 
-MAINTAINER=	ports@openbsd.org
+.if ${MACHINE_ARCH} == "sparc"
+BROKEN=		"Does not work on SPARC"
+.endif
+
+USE_X11=	yes
+USE_GMAKE=	yes
+SEPARATE_BUILD=	yes
+GNU_CONFIGURE=	yes
+
+post-extract:
+	@${MV} ${WRKDIR}/addon ${WRKDIR}/art ${WRKDIR}/levels ${WRKDIR}/lisp \
+	${WRKDIR}/music ${WRKDIR}/sfx ${WRKSRC}/abuse
 
 .include <bsd.port.mk>
diff --git a/games/abuse/files/md5 b/games/abuse/files/md5
index bc12d295578..1725413b4ef 100644
--- a/games/abuse/files/md5
+++ b/games/abuse/files/md5
@@ -1,3 +1,6 @@
-MD5 (abuse_pd.tar.gz) = 86f5884a806999ff6166eb10c00c92ef
-RMD160 (abuse_pd.tar.gz) = 0f69cc38d422fcbf72a36d42433221701a120dfb
-SHA1 (abuse_pd.tar.gz) = 52a703abea31d6f00937d4cc0160af7a454e6630
+MD5 (abuse-2.0.tar.gz) = 9c7d05629fb3273c1304c559da4cfcca
+MD5 (abuse_data.tar.gz) = a9daedbb5fbfbf240d21661e706fe28b
+RMD160 (abuse-2.0.tar.gz) = 6605fe3492be08c45770b2d40d86ac10af0eed59
+RMD160 (abuse_data.tar.gz) = af33d0423b596ae4bb07b5a844fe352aec09b4a0
+SHA1 (abuse-2.0.tar.gz) = 86cbca27c6651ad8a39d15f924224c3afc77aef8
+SHA1 (abuse_data.tar.gz) = 2e7fad6b866fbbc8f34e3ac68cf2689c91596e48
diff --git a/games/abuse/patches/patch-ac b/games/abuse/patches/patch-ac
new file mode 100644
index 00000000000..bf3037bb42d
--- /dev/null
+++ b/games/abuse/patches/patch-ac
@@ -0,0 +1,32 @@
+--- abuse/Makefile.in.orig	Wed Jul  9 00:55:21 1997
++++ abuse/Makefile.in	Sat Aug 29 04:31:24 1998
+@@ -37,10 +37,10 @@
+ AUTOMAKE = @AUTOMAKE@
+ AUTOHEADER = @AUTOHEADER@
+ 
+-INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL = /usr/bin/install -c
++INSTALL_PROGRAM = $(INSTALL) -s -o bin -g games -m 2755 
++INSTALL_DATA = $(INSTALL) -o bin -g games -m 0664
++INSTALL_SCRIPT = $(INSTALL) -o bin -g games -m 0755
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = true
+@@ -239,11 +239,11 @@
+ 
+ install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(pkglibdir)
++	$(mkinstalldirs) $(bindir)
+ 	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "  $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`"; \
+-	     $(INSTALL_PROGRAM) $$p $(pkglibdir)/`echo $$p|sed '$(transform)'`; \
++	    echo "  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
++	     $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/games/abuse/patches/patch-ad b/games/abuse/patches/patch-ad
new file mode 100644
index 00000000000..cc50bc02709
--- /dev/null
+++ b/games/abuse/patches/patch-ad
@@ -0,0 +1,9 @@
+--- abuse/abuse.in.orig	Wed Jul  9 00:54:43 1997
++++ abuse/abuse.in	Sat Aug 29 04:26:04 1998
+@@ -27,5 +27,5 @@
+ if [ x$TERM = xlinux ]; then
+   abuse.console ${1:+"$@"}
+ else
+-  abuse.x11R6 ${1:+"$@"}
++  @exec_prefix@/bin/abuse.x11R6 ${1:+"$@"}
+ fi
diff --git a/games/abuse/pkg/COMMENT b/games/abuse/pkg/COMMENT
index abcaf871df5..ab4aa78f4f9 100644
--- a/games/abuse/pkg/COMMENT
+++ b/games/abuse/pkg/COMMENT
@@ -1 +1 @@
-Crack.Com public domain release of Abuse
+a full color 320x200 arcade quality platform shooter
diff --git a/games/abuse/pkg/DESCR b/games/abuse/pkg/DESCR
index d4ad5412053..433ff543ed4 100644
--- a/games/abuse/pkg/DESCR
+++ b/games/abuse/pkg/DESCR
@@ -1,5 +1,12 @@
-This package contains all of the items you'll need to compile Abuse.
+Crack.com public domain release of Abuse.
+Abuse is an arcade quality game running in a colorfull 320x200 screen.
+Abuse needs a 8bit visual, so you should need to reconfigure your X server.
 
-You need to, at this time, download and extract the dos shareware
-version for the config/lisp/sound/map files from
-ftp://ftp.cdrom.com/pub/abuse/abuse200.zip.
+Here's the plot :
+
+"Falsely accused and imprisoned in a high-security facility, you watch in
+horror as a mysterious biogenetic experiment turns everybody around you --
+guards and prisoners alike, into ravening, inhuman monsters.  Your only
+hope -- steal a suit of powered armor, any weapons you can get your hands
+on, and make your way to the deepest level of the prison, before the
+plague spreads to the outside world." 
diff --git a/games/abuse/pkg/PLIST b/games/abuse/pkg/PLIST
index 0d5814ca732..ae2a21a92bd 100644
--- a/games/abuse/pkg/PLIST
+++ b/games/abuse/pkg/PLIST
@@ -1,2 +1,239 @@
+bin/abuse.x11R6
 bin/abuse
-lib/abuse/abuse.x11R6
+share/abuse/abuse.lsp
+share/abuse/light.tbl
+share/abuse/addon/example/example.lsp
+share/abuse/addon/example/example.spe
+share/abuse/addon/example/example.lvl
+share/abuse/addon/deathmat/deathmat.lsp
+share/abuse/addon/deathmat/username.lsp
+share/abuse/addon/deathmat/version.lsp
+share/abuse/addon/deathmat/dstartup.lsp
+share/abuse/addon/deathmat/gamename.lsp
+share/abuse/addon/deathmat/cur_lev.lsp
+share/abuse/addon/deathmat/medium.lsp
+share/abuse/addon/deathmat/small.lsp
+share/abuse/addon/deathmat/levelset.lsp
+share/abuse/addon/deathmat/large.lsp
+share/abuse/art/fore/foregrnd.spe
+share/abuse/art/fore/techno.spe
+share/abuse/art/fore/techno2.spe
+share/abuse/art/fore/techno3.spe
+share/abuse/art/fore/techno4.spe
+share/abuse/art/fore/cave.spe
+share/abuse/art/back/backgrnd.spe
+share/abuse/art/back/intro.spe
+share/abuse/art/back/cave.spe
+share/abuse/art/back/city.spe
+share/abuse/art/back/tech.spe
+share/abuse/art/tints/cop/africa.spe
+share/abuse/art/tints/cop/blue.spe
+share/abuse/art/tints/cop/fire.spe
+share/abuse/art/tints/cop/gold.spe
+share/abuse/art/tints/cop/land.spe
+share/abuse/art/tints/cop/olive.spe
+share/abuse/art/tints/cop/bright.spe
+share/abuse/art/tints/cop/purple.spe
+share/abuse/art/tints/cop/normal.txt
+share/abuse/art/tints/cop/darkblue.spe
+share/abuse/art/tints/cop/pinkish.spe
+share/abuse/art/tints/cop/yellow.spe
+share/abuse/art/tints/cop/gray.spe
+share/abuse/art/tints/ant/blue.spe
+share/abuse/art/tints/ant/brown.spe
+share/abuse/art/tints/ant/egg.spe
+share/abuse/art/tints/ant/orange.spe
+share/abuse/art/tints/ant/gray.spe
+share/abuse/art/tints/ant/green.spe
+share/abuse/art/tints/ant/mustard.spe
+share/abuse/art/tints/ant/yellow.spe
+share/abuse/art/tints/ant/evil.spe
+share/abuse/art/tints/ant/darkblue.spe
+share/abuse/art/tints/guns/redish.spe
+share/abuse/art/tints/guns/blue.spe
+share/abuse/art/tints/guns/orange.spe
+share/abuse/art/tints/guns/green.spe
+share/abuse/art/chars/block.spe
+share/abuse/art/chars/concus.spe
+share/abuse/art/chars/sect.spe
+share/abuse/art/chars/door.spe
+share/abuse/art/chars/platform.spe
+share/abuse/art/chars/mine.spe
+share/abuse/art/chars/teleport.spe
+share/abuse/art/chars/lightin.spe
+share/abuse/art/chars/tdoor.spe
+share/abuse/art/chars/ammo.spe
+share/abuse/art/chars/lava.spe
+share/abuse/art/chars/lavap.spe
+share/abuse/art/chars/push.spe
+share/abuse/art/chars/step.spe
+share/abuse/art/misc.spe
+share/abuse/art/cop.spe
+share/abuse/art/frame.spe
+share/abuse/art/missle.spe
+share/abuse/art/title.spe
+share/abuse/art/cloud.spe
+share/abuse/art/pform.spe
+share/abuse/art/exp1.spe
+share/abuse/art/door.spe
+share/abuse/art/help.spe
+share/abuse/art/jug.spe
+share/abuse/art/flyer.spe
+share/abuse/art/statbar.spe
+share/abuse/art/rob1.spe
+share/abuse/art/blowups.spe
+share/abuse/art/compass.spe
+share/abuse/art/ant.spe
+share/abuse/art/icons.spe
+share/abuse/art/rob2.spe
+share/abuse/art/fonts.spe
+share/abuse/art/letters.spe
+share/abuse/art/dev.spe
+share/abuse/art/endgame.spe
+share/abuse/art/smoke.spe
+share/abuse/art/ball.spe
+share/abuse/art/credit.spe
+share/abuse/art/consfnt.spe
+share/abuse/art/satan.bak
+share/abuse/art/bold.spe
+share/abuse/art/coptop.spe
+share/abuse/art/gun2.spe
+share/abuse/art/screen11.spe
+share/abuse/levels/level03.spe
+share/abuse/levels/level03.cpf
+share/abuse/levels/level00.spe
+share/abuse/levels/level00.cpf
+share/abuse/levels/level01.spe
+share/abuse/levels/level01.cpf
+share/abuse/levels/level02.spe
+share/abuse/levels/level02.cpf
+share/abuse/levels/demo1.dat
+share/abuse/lisp/weapons.lsp
+share/abuse/lisp/share.lsp
+share/abuse/lisp/version.lsp
+share/abuse/lisp/options.lsp
+share/abuse/lisp/sfxls~27.old
+share/abuse/lisp/chat.lsp
+share/abuse/lisp/upgrade.lsp
+share/abuse/lisp/french.lsp
+share/abuse/lisp/startup.lsp
+share/abuse/lisp/people.lsp
+share/abuse/lisp/german.lsp
+share/abuse/lisp/sfx.lsp
+share/abuse/lisp/ant.lsp
+share/abuse/lisp/duong.lsp
+share/abuse/lisp/explo.lsp
+share/abuse/lisp/jugger.lsp
+share/abuse/lisp/platform.lsp
+share/abuse/lisp/guns.lsp
+share/abuse/lisp/language.lsp
+share/abuse/lisp/gates.lsp
+share/abuse/lisp/english.lsp
+share/abuse/lisp/flyer.lsp
+share/abuse/lisp/common.lsp
+share/abuse/lisp/input.lsp
+share/abuse/lisp/powerup.lsp
+share/abuse/lisp/doors.lsp
+share/abuse/lisp/userfuns.lsp
+share/abuse/lisp/teleport.lsp
+share/abuse/lisp/ladder.lsp
+share/abuse/lisp/light.lsp
+share/abuse/lisp/general.lsp
+share/abuse/lisp/switch.lsp
+share/abuse/lisp/playwav.lsp
+share/abuse/sfx/plpain10.wav
+share/abuse/sfx/metal.wav
+share/abuse/sfx/cleaner.wav
+share/abuse/sfx/plpain04.wav
+share/abuse/sfx/save01.wav
+share/abuse/sfx/amb11.wav
+share/abuse/sfx/amb13.wav
+share/abuse/sfx/amb15.wav
+share/abuse/sfx/amb16.wav
+share/abuse/sfx/poof05.wav
+share/abuse/sfx/aland01.wav
+share/abuse/sfx/alien01.wav
+share/abuse/sfx/amb07.wav
+share/abuse/sfx/ammo01.wav
+share/abuse/sfx/ammo02.wav
+share/abuse/sfx/aslash01.wav
+share/abuse/sfx/amb10.wav
+share/abuse/sfx/crmble01.wav
+share/abuse/sfx/eleacc01.wav
+share/abuse/sfx/lasrmis2.wav
+share/abuse/sfx/elect02.wav
+share/abuse/sfx/eledec01.wav
+share/abuse/sfx/speed02.wav
+share/abuse/sfx/plasma02.wav
+share/abuse/sfx/explod02.wav
+share/abuse/sfx/timerfst.wav
+share/abuse/sfx/poof06.wav
+share/abuse/sfx/fadeon01.wav
+share/abuse/sfx/save05.wav
+share/abuse/sfx/grenad01.wav
+share/abuse/sfx/lava01.wav
+share/abuse/sfx/mghit01.wav
+share/abuse/sfx/mghit02.wav
+share/abuse/sfx/pldeth02.wav
+share/abuse/sfx/pldeth04.wav
+share/abuse/sfx/pland01.wav
+share/abuse/sfx/pldeth05.wav
+share/abuse/sfx/robot02.wav
+share/abuse/sfx/pldeth07.wav
+share/abuse/sfx/rocket02.wav
+share/abuse/sfx/swish01.wav
+share/abuse/sfx/switch01.wav
+share/abuse/sfx/fly03.wav
+share/abuse/sfx/telept01.wav
+share/abuse/sfx/throw01.wav
+share/abuse/sfx/zap3.wav
+share/abuse/sfx/zap2.wav
+share/abuse/sfx/flamloop.wav
+share/abuse/sfx/force01.wav
+share/abuse/sfx/link01.wav
+share/abuse/sfx/apain01.wav
+share/abuse/sfx/adie05.wav
+share/abuse/sfx/adie02.wav
+share/abuse/sfx/adie03.wav
+share/abuse/sfx/ahit01.wav
+share/abuse/sfx/ball01.wav
+share/abuse/sfx/blkfoot4.wav
+share/abuse/sfx/ambtech1.wav
+share/abuse/sfx/ambtech2.wav
+share/abuse/sfx/ambtech3.wav
+share/abuse/sfx/ambcave1.wav
+share/abuse/sfx/ambcave2.wav
+share/abuse/sfx/ambcave3.wav
+share/abuse/sfx/ambcave4.wav
+share/abuse/sfx/ambfrst2.wav
+share/abuse/sfx/scream02.wav
+share/abuse/sfx/scream03.wav
+share/abuse/sfx/scream08.wav
+share/abuse/sfx/logo09.wav
+share/abuse/sfx/plpain01.wav
+share/abuse/sfx/plpain02.wav
+share/abuse/sfx/firebmb1.wav
+share/abuse/sfx/doorup01.wav
+share/abuse/sfx/doorup02.wav
+share/abuse/sfx/health01.wav
+share/abuse/sfx/shotgn31.wav
+share/abuse/sfx/spring03.wav
+share/abuse/sfx/plasma03.wav
+share/abuse/sfx/endlvl02.wav
+share/abuse/sfx/delobj01.wav
+share/abuse/sfx/button02.wav
+@dirrm share/abuse/addon/deathmat
+@dirrm share/abuse/addon/example
+@dirrm share/abuse/addon
+@dirrm share/abuse/art/chars
+@dirrm share/abuse/art/tints/ant
+@dirrm share/abuse/art/tints/cop
+@dirrm share/abuse/art/tints/guns
+@dirrm share/abuse/art/tints
+@dirrm share/abuse/art/back
+@dirrm share/abuse/art/fore
+@dirrm share/abuse/art
+@dirrm share/abuse/lisp
+@dirrm share/abuse/levels
+@dirrm share/abuse/sfx
+@dirrm share/abuse