diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index 8d7bb6b73ee9..b37be964d041 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	regina
 PORTVERSION=	3.9.3
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-rexx/${PORTNAME}-rexx/${PORTVERSION}:source \
 		SF/${PORTNAME}-rexx/${PORTNAME}-documentation/3.9.1:docs
 PKGNAMEPREFIX=	rexx-
 DISTNAME=	regina-rexx-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	bob@eager.cx
 COMMENT=	Rexx interpreter
 WWW=		http://regina-rexx.sourceforge.net/
 
 LICENSE=	LGPL21+
 
 USES=		gmake iconv ncurses
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	rxstack
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-addon-dir=${PREFIX}/lib/Regina-REXX/addons
 CONFIGURE_ENV=	ac_cv_c_char_unsigned=yes
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS=	rexx-imc-[0-0]* oorexx
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 DOCS_DISTFILES=	regina.pdf:docs \
 		regutil.pdf:docs
 
 post-extract-DOCS-on:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/regina.pdf ${WRKDIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/regutil.pdf ${WRKDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^examplesdir/s|=.*|= $$(datadir)/examples/$$(PACKAGE)| ; \
 		 /$$(sysconfdir)/s|^|#|' ${WRKSRC}/Makefile.in
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/regina.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/regutil.pdf ${STAGEDIR}${DOCSDIR}
 
 post-stage:
-	@${LN} -f ${STAGEDIR}/${PREFIX}/man/man1/regina.1.gz \
-		${STAGEDIR}/${PREFIX}/man/man1/rexx.1.gz
+	@${LN} -f ${STAGEDIR}/${PREFIX}/share/man/man1/regina.1.gz \
+		${STAGEDIR}/${PREFIX}/share/man/man1/rexx.1.gz
 
 .include <bsd.port.mk>
diff --git a/lang/rexx-regina/pkg-plist b/lang/rexx-regina/pkg-plist
index ec88bf65ca8a..613127e0cae1 100644
--- a/lang/rexx-regina/pkg-plist
+++ b/lang/rexx-regina/pkg-plist
@@ -1,35 +1,35 @@
 bin/regina
 bin/regina-config
 bin/rexx
 bin/rxqueue
 bin/rxstack
 include/rexxsaa.h
 lib/Regina-REXX/addons/libregutil.so
 lib/Regina-REXX/addons/librxtest1.so
 lib/Regina-REXX/addons/librxtest2.so
 lib/libregina.a
 lib/libregina.so
 libdata/pkgconfig/libregina.pc
-man/man1/regina.1.gz
-man/man1/rexx.1.gz
-man/man1/regina-config.1.gz
-man/man1/rxqueue.1.gz
-man/man1/rxstack.1.gz
+share/man/man1/regina.1.gz
+share/man/man1/rexx.1.gz
+share/man/man1/regina-config.1.gz
+share/man/man1/rxqueue.1.gz
+share/man/man1/rxstack.1.gz
 %%DATADIR%%/de.mtb
 %%DATADIR%%/en.mtb
 %%DATADIR%%/es.mtb
 %%DATADIR%%/no.mtb
 %%DATADIR%%/pl.mtb
 %%DATADIR%%/pt.mtb
 %%DATADIR%%/sv.mtb
 %%DATADIR%%/tr.mtb
 %%PORTDOCS%%%%DOCSDIR%%/regina.pdf
 %%PORTDOCS%%%%DOCSDIR%%/regutil.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/animal.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/block.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dateconv.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynfunc.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newstr.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/regutil.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rexxcps.rexx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/timeconv.rexx