diff --git a/editors/the/Makefile b/editors/the/Makefile
index 88736bb707e4..b50fcdf8b9a3 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -1,77 +1,78 @@
 PORTNAME=	the
 PORTVERSION=	3.3.r4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://downloads.sourceforge.net/hessling-editor/
 DISTNAME=	THE-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=	comet.berkeley@gmail.com
 COMMENT=	The Hessling Editor, like the VM/CMS xedit editor
 WWW=		https://hessling-editor.sourceforge.net/
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-rexxincdir=${LOCALBASE}/include \
 		--with-rexxlibdir=${LOCALBASE}/lib
 ALL_TARGET=	all html
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=		DOCS XAW3D
 OPTIONS_SINGLE=		DISPLAY REXX
 OPTIONS_SINGLE_DISPLAY=	NCURSES XCURSES
 OPTIONS_SINGLE_REXX=	REXX_IMC REGINA
 OPTIONS_DEFAULT=	NCURSES REGINA
 OPTIONS_SUB=		yes
 
 XAW3D_DESC=		Enable Xaw3D
 NCURSES_DESC=		Build standard NCurses version
 XCURSES_DESC=		Build XCurses (X11) version
 REXX_IMC_DESC=		Use Rexx/imc interpreter
 REGINA_DESC=		Use Regina Rexx interpreter
 
 XAW3D_CONFIGURE_WITH=	xaw3d
 XAW3D_BUILD_DEPENDS=	${LOCALBASE}/lib/libXaw3d.a:x11-toolkits/Xaw3d
 
 NCURSES_USES=		ncurses
 NCURSES_CONFIGURE_ON=	--with-ncurses \
 			--with-cursesincdir=${NCURSESINC} \
 			--with-curseslibdir=${NCURSESLIB}
 
 XCURSES_LIB_DEPENDS=	libXCurses.so:devel/pdcurses
 XCURSES_CONFIGURE_ON=	--with-xcurses \
 			--with-cursesincdir=${LOCALBASE}/include \
 			--with-curseslibdir=${LOCALBASE}/lib
 XCURSES_CFLAGS=		-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/xcurses
 
 REXX_IMC_CONFIGURE_ON=	--with-rexx=rexximc
 REXX_IMC_BUILD_DEPENDS=	rexx:lang/rexx-imc
 REXX_IMC_RUN_DEPENDS=	rexx:lang/rexx-imc
 REXX_IMC_BROKEN=	fails to build with REXX_IMC option
 
 REGINA_CONFIGURE_ON=	--with-rexx=regina
 REGINA_BUILD_DEPENDS=	regina:lang/rexx-regina
 REGINA_RUN_DEPENDS=	regina:lang/rexx-regina
 
 post-extract:
 	${REINPLACE_CMD} -e 's|(datadir)/THE|(datadir)/the|g' \
 			-e 's|/share/THE|/share/the|g' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's|ltermcap|lncurses|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e '/FUNCTION_KEY/d' ${WRKSRC}/the.c
 
 pre-install:
 	${MKDIR}				${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/the64.gif	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/the64.png	${STAGEDIR}${DOCSDIR}
 
 do-install-XCURSES-on:
 	${STRIP_CMD}	${STAGEDIR}${PREFIX}/bin/xthe
 	${LN} -sf xthe	${STAGEDIR}${PREFIX}/bin/the
 
 do-install-NCURSES-on:
 	${STRIP_CMD}	${STAGEDIR}${PREFIX}/bin/nthe
 	${LN} -sf nthe	${STAGEDIR}${PREFIX}/bin/the
 
 .include <bsd.port.mk>
diff --git a/editors/the/pkg-plist b/editors/the/pkg-plist
index 2a13a37300d9..5365489ed981 100644
--- a/editors/the/pkg-plist
+++ b/editors/the/pkg-plist
@@ -1,68 +1,68 @@
 %%NCURSES%%bin/nthe
 bin/the
 %%XCURSES%%bin/xthe
-man/man1/the.1.gz
+share/man/man1/the.1.gz
 %%DATADIR%%/THE_Help.txt
 %%DATADIR%%/abf.tld
 %%DATADIR%%/append.the
 %%DATADIR%%/build.the
 %%DATADIR%%/c.tld
 %%DATADIR%%/cdiff.tld
 %%DATADIR%%/cobol.tld
 %%DATADIR%%/codecomp.the
 %%DATADIR%%/comm.the
 %%DATADIR%%/compile.the
 %%DATADIR%%/complete.the
 %%DATADIR%%/config.the
 %%DATADIR%%/csh.tld
 %%DATADIR%%/cua.the
 %%DATADIR%%/demo.the
 %%DATADIR%%/diff.tld
 %%DATADIR%%/dir.tld
 %%DATADIR%%/fortran.tld
 %%DATADIR%%/html.tld
 %%DATADIR%%/java.tld
 %%DATADIR%%/js.tld
 %%DATADIR%%/l.the
 %%DATADIR%%/m4.tld
 %%DATADIR%%/make.tld
 %%DATADIR%%/match.the
 %%DATADIR%%/nl.the
 %%DATADIR%%/nsi.tld
 %%DATADIR%%/objc.tld
 %%DATADIR%%/opl.tld
 %%DATADIR%%/plsql.tld
 %%DATADIR%%/rexx.syntax
 %%DATADIR%%/rexx.tld
 %%DATADIR%%/rexxdw.syntax
 %%DATADIR%%/rexxeec.syntax
 %%DATADIR%%/rexxutil.syntax
 %%DATADIR%%/rm.the
 %%DATADIR%%/sh.tld
 %%DATADIR%%/spec.tld
 %%DATADIR%%/spell.the
 %%DATADIR%%/syntax.the
 %%DATADIR%%/tags.the
 %%DATADIR%%/total.the
 %%DATADIR%%/udiff.tld
 %%DATADIR%%/uncomm.the
 %%DATADIR%%/words.the
 %%PORTDOCS%%%%DOCSDIR%%/app1.html
 %%PORTDOCS%%%%DOCSDIR%%/app2.html
 %%PORTDOCS%%%%DOCSDIR%%/app3.html
 %%PORTDOCS%%%%DOCSDIR%%/app4.html
 %%PORTDOCS%%%%DOCSDIR%%/app5.html
 %%PORTDOCS%%%%DOCSDIR%%/app6.html
 %%PORTDOCS%%%%DOCSDIR%%/app7.html
 %%PORTDOCS%%%%DOCSDIR%%/comm.html
 %%PORTDOCS%%%%DOCSDIR%%/commset.html
 %%PORTDOCS%%%%DOCSDIR%%/commsos.html
 %%PORTDOCS%%%%DOCSDIR%%/fdl.html
 %%PORTDOCS%%%%DOCSDIR%%/glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/history.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/overview.html
 %%PORTDOCS%%%%DOCSDIR%%/query.html
 %%PORTDOCS%%%%DOCSDIR%%/quickref.html
 %%PORTDOCS%%%%DOCSDIR%%/the64.gif
 %%PORTDOCS%%%%DOCSDIR%%/the64.png