diff --git a/games/fairymax/Makefile b/games/fairymax/Makefile
index 7d5ac976a098..6cc08aa00c7a 100644
--- a/games/fairymax/Makefile
+++ b/games/fairymax/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fairymax
-PORTVERSION=	4.8V.9
+PORTVERSION=	5.0b
 CATEGORIES=	games
 MASTER_SITES=	http://freeheimdall.spdns.org/files/
 # http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=fairymax.git;a=snapshot;h=${COMMIT_HASH};sf=tgz
@@ -13,46 +13,35 @@ DISTNAME=	${PORTNAME}-${COMMIT_HASH}
 MAINTAINER=	kalten@gmx.at
 COMMENT=	Chess engine for shatranj, courier chess, and others
 
-CONFLICTS=	fairymax-4.8[QST].*
+CONFLICTS=	fairymax-4.*
 
-COMMIT_HASH=	12bd72f
+COMMIT_HASH=	f7a7847
 
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
+OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	changelog copyright CVfairy.html README
 
-PLUGINSDIR=	${PREFIX}/share/games/plugins
-
 USES=		gmake perl5
 USE_PERL5=	build
-MAKE_ARGS+=	INI_F=${DATADIR}/fmax.ini \
-		INI_Q=${DATADIR}/qmax.ini
-
-OPTIMIZED_CFLAGS_CFLAGS=	-O2
+MAKE_ARGS+=	prefix= \
+		bindir=${PREFIX}/bin \
+		mandir=${PREFIX}/man \
+		datadir= \
+		plugindir=${PREFIX}/share/games/plugins \
+		fairydir=${DATADIR} \
+		VERSION=${PORTVERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'	\
-			-e 's|%%DATADIR%%|${DATADIR}|g'	\
-		${WRKSRC}/fairymax.pod
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fairymax ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/shamax ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/maxqi ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/data/fmax.ini ${STAGEDIR}${DATADIR}/fmax.ini
-	${INSTALL_DATA} ${WRKSRC}/data/qmax.ini ${STAGEDIR}${DATADIR}/qmax.ini
-	${INSTALL_MAN} ${WRKSRC}/fairymax.6.gz ${STAGEDIR}${MAN6PREFIX}/man/man6/
-	${LN} -s ${MAN6PREFIX}/man/man6/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/shamax.6
-	${LN} -s ${MAN6PREFIX}/man/man6/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/maxqi.6
-	@${MKDIR} ${STAGEDIR}${PLUGINSDIR}
-	@${MKDIR} ${STAGEDIR}${PLUGINSDIR}/logos
-	@${MKDIR} ${STAGEDIR}${PLUGINSDIR}/xboard
-	${INSTALL_DATA} ${WRKSRC}/data/logo.png ${STAGEDIR}${PLUGINSDIR}/logos/fairymax.png
-	${LN} -s ${PLUGINSDIR}/logos/fairymax.png ${STAGEDIR}${PLUGINSDIR}/logos/shamax.png
-	${LN} -s ${PLUGINSDIR}/logos/fairymax.png ${STAGEDIR}${PLUGINSDIR}/logos/maxqi.png
-	${INSTALL_DATA} ${WRKSRC}/data/*.eng ${STAGEDIR}${PLUGINSDIR}/xboard/
+	@${REINPLACE_CMD} -E 's|(#define VERSION ")[^"]+(".*)|\1${PORTVERSION}\2|' \
+		${WRKSRC}/fairymax.c
+	@${REINPLACE_CMD} -E 's|^(prefix\|bindir\|mandir\|datadir\|plugindir\|fairydir) =|\1 ?=|' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E 's|^	cp (.{srcdir}/fairymax .{srcdir}/shamax .{srcdir}/maxqi .\(DESTDIR\).\(bindir\))|	${INSTALL_PROGRAM} \1|' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E 's|^	cp (.{srcdir}/data/)|	${INSTALL_DATA} \1|' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E 's|^	cp (.{srcdir}/fairymax.6.gz)|	${INSTALL_MAN} \1|' \
+		${WRKSRC}/Makefile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/fairymax/distinfo b/games/fairymax/distinfo
index 0dafdb4e3c07..e541887250c6 100644
--- a/games/fairymax/distinfo
+++ b/games/fairymax/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fairymax-12bd72f.tar.gz) = d83444d67a9303bd1a7c7af8d5285a95e02cc9a3efd3dee6c63ec9f54a2a5768
-SIZE (fairymax-12bd72f.tar.gz) = 60492
+SHA256 (fairymax-f7a7847.tar.gz) = 1afedf536bdf29ae249e34222f47c703b1700031c603a238be6ca5ef0ab46696
+SIZE (fairymax-f7a7847.tar.gz) = 67418
diff --git a/games/fairymax/pkg-plist b/games/fairymax/pkg-plist
index d0654f1264c2..000e3aec77c5 100644
--- a/games/fairymax/pkg-plist
+++ b/games/fairymax/pkg-plist
@@ -2,10 +2,9 @@ bin/fairymax
 bin/maxqi
 bin/shamax
 man/man6/fairymax.6.gz
-man/man6/maxqi.6.gz
-man/man6/shamax.6.gz
 %%DATADIR%%/fmax.ini
 %%DATADIR%%/qmax.ini
+%%DATADIR%%/makruk.hash
 share/games/plugins/logos/fairymax.png
 share/games/plugins/logos/maxqi.png
 share/games/plugins/logos/shamax.png