diff --git a/games/an/Makefile b/games/an/Makefile
index 4bae50eb065..733cab78b20 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -1,24 +1,36 @@
-# $OpenBSD: Makefile,v 1.14 2007/09/15 18:01:00 simon Exp $
+# $OpenBSD: Makefile,v 1.15 2007/12/04 10:04:53 ajacoutot Exp $
 
 COMMENT=	fast anagram generator
 
-DISTNAME=	an-0.93
+V=		0.95
+DISTNAME=	an_${V}.orig
+PKGNAME=	an-${V}
 CATEGORIES=	games
-MASTER_SITES=	ftp://suburbia.net/pub/rmj/
+MASTER_SITES=	ftp://ftp.fr.debian.org/debian/pool/main/a/an/ \
+		ftp://ftp.debian.org/debian/pool/main/a/an/
 
+# GPL - LGPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
 
-MAKE_ENV=	DEFS=-DDEFDICT=\\\"/usr/share/dict/words\\\"
-ALL_TARGET=	with-getopt
+WANTLIB=	c
+
+WRKDIST=	${WRKDIR}/an-${V}
 
 NO_REGRESS=	Yes
 
+pre-configure:
+	@perl -pi -e 's,/usr/dict/words,/usr/share/dict/words,g' \
+		${WRKSRC}/an.6
+
+do-build:
+	cd ${WRKBUILD} && \
+	${CC} ${CFLAGS} an.c gan_qsort.c -o an ${LDFLAGS}
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/an ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/an.6 ${PREFIX}/man/man6
+	${INSTALL_PROGRAM} ${WRKBUILD}/an ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKBUILD}/an.6 ${PREFIX}/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/an/distinfo b/games/an/distinfo
index ac42903c45d..35fc03eb9df 100644
--- a/games/an/distinfo
+++ b/games/an/distinfo
@@ -1,5 +1,5 @@
-MD5 (an-0.93.tar.gz) = p4QZ07fO30bG1XMRwwYilw==
-RMD160 (an-0.93.tar.gz) = Sy+MerGS03nwuDs7guCECuh3K6g=
-SHA1 (an-0.93.tar.gz) = kgKzLvp02kQVDqItNuC8EEwB5/g=
-SHA256 (an-0.93.tar.gz) = pRix/zpKDURl0zymenHpLqNC9/Hzbb32qiJjBWjebVE=
-SIZE (an-0.93.tar.gz) = 84531
+MD5 (an_0.95.orig.tar.gz) = H2d3XdUFpLrX+JHWBi2lYA==
+RMD160 (an_0.95.orig.tar.gz) = 7sYSFOrz86sGZs7EoUbtN+fpYmM=
+SHA1 (an_0.95.orig.tar.gz) = kwzm9zfaMVWX8BtG90xgsrtmOb8=
+SHA256 (an_0.95.orig.tar.gz) = ESZt0eNHWU2Y+N/R4UHYtPvgZ3UlQtDpPEIsR4n5KVw=
+SIZE (an_0.95.orig.tar.gz) = 47829
diff --git a/games/an/patches/patch-Makefile b/games/an/patches/patch-Makefile
deleted file mode 100644
index e061cffd42c..00000000000
--- a/games/an/patches/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2001/03/17 14:58:41 wilfried Exp $
---- Makefile.orig	Mon Sep 30 05:57:36 1996
-+++ Makefile	Fri Mar 16 19:37:18 2001
-@@ -27,14 +27,14 @@ MANDIR=/usr/man/man6
- 
- 
- # Note that if you change CC here you must also change it in ./lib/Makefile
--CC=gcc
-+#CC=gcc
- 
- # if using a compiler which adheres strictly to ANSI C guidelines then
- # uncomment the next line.
- 
- #DEFS=-DFORCE_ANSI
- 
--CFLAGS=-O -I $(LIBDIR) $(DEFS)
-+CFLAGS+= -I $(LIBDIR) $(DEFS)
- 
- # Nothing should need changing below here
- 
diff --git a/games/an/patches/patch-lib_Makefile b/games/an/patches/patch-lib_Makefile
deleted file mode 100644
index a74d2b66e43..00000000000
--- a/games/an/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-lib_Makefile,v 1.1 2001/03/17 14:58:41 wilfried Exp $
---- lib/Makefile.orig	Mon Sep 30 05:57:36 1996
-+++ lib/Makefile	Fri Mar 16 19:37:49 2001
-@@ -22,7 +22,5 @@
- #Note may need to change this for your system, the only reason this Makefile
- #exists is because the non-gnu make on suns is brain dead.
- 
--CC=gcc
--CFLAGS=-O
- all: getopt.o getopt1.o
-