diff --git a/games/awale/Makefile b/games/awale/Makefile
index 9468e058cee5..b06af916c2f6 100644
--- a/games/awale/Makefile
+++ b/games/awale/Makefile
@@ -2,35 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	awale
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	African board game
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		tk:wrapper
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils tk
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS
+PORTDATA=	*
+PORTDOCS=	*
+PLIST_FILES=	bin/awale \
+		bin/xawale \
+		man/man6/awale.6.gz \
+		man/man6/xawale.6.gz \
+		share/applications/awale.desktop
+
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/src/x${PORTNAME}
-	@${ECHO_CMD} "${DATADIR}/xawale.tcl" >> ${WRKSRC}/src/x${PORTNAME}
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh| ; \
-		s|exec wish|exec ${WISH}|' \
-		${WRKSRC}/src/xawale.tcl
-	@${REINPLACE_CMD} -e 's|share/man|man|' \
-		${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^mandir/s|=.*|= @mandir@|' ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|/bin/bash|/bin/sh|' ${WRKSRC}/src/xawale.tcl
+
+post-build:
+	@${ECHO_CMD} -n > ${WRKSRC}/src/xawale
+	@${ECHO_CMD} "#!/bin/sh" >> ${WRKSRC}/src/xawale
+	@${ECHO_CMD} "${DATADIR}/xawale.tcl" >> ${WRKSRC}/src/xawale
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS ChangeLog NEWS README THANKS
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/games/awale/distinfo b/games/awale/distinfo
index ffa759cc0597..80149afbf358 100644
--- a/games/awale/distinfo
+++ b/games/awale/distinfo
@@ -1,2 +1,2 @@
-SHA256 (awale-1.5.tar.gz) = 8bf9812fd6cfe142e18a35474f6a366c1b12f960863a33421f6d2e448ed47014
-SIZE (awale-1.5.tar.gz) = 489357
+SHA256 (awale-1.6.tar.gz) = f5118dbfe50de21d64b950e1824388362b98bcfaed9b8f0d2c7353617e24de55
+SIZE (awale-1.6.tar.gz) = 490881
diff --git a/games/awale/pkg-plist b/games/awale/pkg-plist
deleted file mode 100644
index 03ba95834de4..000000000000
--- a/games/awale/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-bin/awale
-bin/xawale
-man/man6/awale.6.gz
-man/man6/xawale.6.gz
-share/applications/awale.desktop
-%%DATADIR%%/AwaleBanner.bmp
-%%DATADIR%%/README
-%%DATADIR%%/Trou00.gif
-%%DATADIR%%/Trou01.gif
-%%DATADIR%%/Trou02.gif
-%%DATADIR%%/Trou03.gif
-%%DATADIR%%/Trou04.gif
-%%DATADIR%%/Trou05.gif
-%%DATADIR%%/Trou06.gif
-%%DATADIR%%/Trou07.gif
-%%DATADIR%%/Trou08.gif
-%%DATADIR%%/Trou09.gif
-%%DATADIR%%/Trou10.gif
-%%DATADIR%%/Trou11.gif
-%%DATADIR%%/Trou12.gif
-%%DATADIR%%/Trou13.gif
-%%DATADIR%%/Trou14.gif
-%%DATADIR%%/Trou15.gif
-%%DATADIR%%/awale.ico
-%%DATADIR%%/awale.png
-%%DATADIR%%/board.gif
-%%DATADIR%%/copyright.gif
-%%DATADIR%%/fr.gif
-%%DATADIR%%/sp.gif
-%%DATADIR%%/uk.gif
-%%DATADIR%%/xawale.tcl