diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index a841ca9e8422..107b7f6c6429 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	aspell
 PORTVERSION=	0.60.8.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
 WWW=		http://aspell.net/
 
 LICENSE=	LGPL21
 
 USES=		cpe gmake iconv libtool ncurses perl5 shebangfix
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
-		--enable-docdir=${DOCSDIR}	\
-		--enable-curses="${NCURSESLIBS}" \
+
+CONFIGURE_ARGS=	--enable-curses="${NCURSESLIBS}" \
+		--enable-dict-dir=${DATADIR} \
+		--enable-docdir=${DOCSDIR} \
 		--enable-static
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/aspell-import
 CPE_VENDOR=	gnu
 
-INSTALL_TARGET=	install-strip
-VERINST=	${PORTVERSION:R:R}
 SUB_FILES=	aspell.ver
-PLIST_SUB=	VER=${VERINST}
-SUB_LIST=	VERINST=${VERINST}
+PLIST_SUB=	VER=${PORTVERSION:R:R}
+SUB_LIST=	VER=${PORTVERSION:R:R}
 INFO=		aspell aspell-dev
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/files/aspell.ver.in b/textproc/aspell/files/aspell.ver.in
index 4de3caac64fb..0e44af6f2da0 100644
--- a/textproc/aspell/files/aspell.ver.in
+++ b/textproc/aspell/files/aspell.ver.in
@@ -1,2 +1,2 @@
 # Installed by textproc/aspell, please don't edit manually!
-VER=	%%VERINST%%
+VER=	%%VER%%