diff --git fairymax/Makefile fairymax/Makefile
index 6bb5ce8..f250021 100644
--- fairymax/Makefile
+++ fairymax/Makefile
@@ -2,17 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	fairymax
-PORTVERSION=	4.8Q
-PORTREVISION=	1
+PORTVERSION=	4.8S.5
 CATEGORIES=	games
 MASTER_SITES=	http://freeheimdall.homeunix.org/files/
-DISTNAME=	${PORTNAME}-c7a129e
-# http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=fairymax.git;a=snapshot;h=c7a129ead81286990efb8409f238c48c7109c83b;sf=tgz
+DISTNAME=	${PORTNAME}-b6a7fa8
+# http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=fairymax.git;a=snapshot;h=b6a7fa8ae7c54db7bb5a9415ccae3fd55e9b360e;sf=tgz
 
 MAINTAINER=	kalten@gmx.at
 COMMENT=	Chess engine for shatranj, courier chess, and others
 
-CONFLICTS=	fairymax-4.8Q.[0-9]* fairymax-4.8Q.[0-9]*_[0-9]*
+CONFLICTS=	fairymax-4.8Q.*
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
@@ -32,12 +31,12 @@ MLINKS=		${PORTNAME}.6 shamax.6 \
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-MAKE_ARGS+=	INI_FILE_fmax=${DATADIR}/fmax.ini \
-		INI_FILE_qmax=${DATADIR}/qmax.ini
+MAKE_ARGS+=	INI_F=${DATADIR}/fmax.ini \
+		INI_Q=${DATADIR}/qmax.ini
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CLAGS}
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O2
 .else
 CFLAGS+=
diff --git fairymax/distinfo fairymax/distinfo
index ef3c0b3..2fc97e0 100644
--- fairymax/distinfo
+++ fairymax/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fairymax/fairymax-c7a129e.tar.gz) = ec8e75c92e345e0f0db56095ac576156f54fb9320af05e86f8e589a8300c5a9a
-SIZE (fairymax/fairymax-c7a129e.tar.gz) = 34229
+SHA256 (fairymax/fairymax-b6a7fa8.tar.gz) = c61887aad9b5495c78a6bc20703d1fa8665b2a3881fb68e4ef5cad400d11d0b8
+SIZE (fairymax/fairymax-b6a7fa8.tar.gz) = 44424
diff --git fairymax/files/patch-Makefile fairymax/files/patch-Makefile
deleted file mode 100644
index 0907c0f..0000000
--- fairymax/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2010-12-08 10:03:32.000000000 +0100
-+++ Makefile	2011-04-23 17:09:50.000000000 +0200
-@@ -1,21 +1,22 @@
- srcdir = .
- 
--CC=gcc
--CFLAGS += -O2
--
-+CC?=gcc
-+CFLAGS +=
-+INI_FILE_fmax?="/usr/share/games/fairymax/fmax.ini"
-+INI_FILE_qmax?="/usr/share/games/fairymax/qmax.ini"
- 
- ALL= fairymax shamax maxqi fairymax.6.gz
- 
- all: ${ALL}
- 
- fairymax: fairymax.c
--	$(CC) $(CFLAGS) -DINI_FILE=\"/usr/share/games/fairymax/fmax.ini\" fairymax.c -o fairymax
-+	$(CC) $(CFLAGS) -DINI_FILE=\"${INI_FILE_fmax}\" fairymax.c -o fairymax
- 
- shamax: fairymax.c
--	$(CC) $(CFLAGS) -DINI_FILE=\"/usr/share/games/fairymax/fmax.ini\" -DSHATRANJ fairymax.c -o shamax
-+	$(CC) $(CFLAGS) -DINI_FILE=\"${INI_FILE_fmax}\" -DSHATRANJ fairymax.c -o shamax
- 
- maxqi: maxqi.c
--	$(CC) $(CFLAGS) -DINI_FILE=\"/usr/share/games/fairymax/qmax.ini\" maxqi.c -o maxqi
-+	$(CC) $(CFLAGS) -DINI_FILE=\"${INI_FILE_qmax}\" maxqi.c -o maxqi
- 
- install: ${ALL} ${srcdir}/data/*
- 	cp -u ${srcdir}/fairymax $(DESTDIR)/usr/games
diff --git fairymax/files/patch-fairymax.pod fairymax/files/patch-fairymax.pod
deleted file mode 100644
index be818ed..0000000
--- fairymax/files/patch-fairymax.pod
+++ /dev/null
@@ -1,23 +0,0 @@
---- fairymax.pod.orig	2010-12-08 10:03:32.000000000 +0100
-+++ fairymax.pod	2011-04-23 01:11:01.000000000 +0200
-@@ -117,11 +117,20 @@
- 
- =back
- 
-+=head1 FILES
-+
-+%%DATADIR%%/fmax.ini
-+
-+%%DATADIR%%/qmax.ini
- 
- =head1 SEE ALSO
- 
- xboard(6)
- 
-+http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=fairymax.git
-+
-+http://home.hccnet.nl/h.g.muller/fairy.html
-+
- http://www.chessvariants.org/index/msdisplay.php?itemid=MSfairy-max
- 
- http://home.hccnet.nl/h.g.muller/max-src2.html
diff --git fairymax/pkg-descr fairymax/pkg-descr
index e584826..6a65df4 100644
--- fairymax/pkg-descr
+++ fairymax/pkg-descr
@@ -7,4 +7,4 @@ You can use it e.g. with games/xboard/:
 e.g.: xboard -boardSize Middling -variant courier -fcp fairymax
 
 GIT: http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=fairymax.git
-WWW: http://home.hccnet.nl/h.g.muller/fairy.html
+WWW: http://www.chessvariants.org/index/msdisplay.php?itemid=MSfairy-max