diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index ed517216ce4d..48008945d8fa 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,49 +1,51 @@
 PORTNAME=	minicom
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	comms
 
 MAINTAINER=	jailbird@fdf.net
 COMMENT=	MS-DOS Telix serial communication program "workalike"
 WWW=		https://salsa.debian.org/minicom-team/minicom/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	lrz:comms/lrzsz
 
 USES=		cpe iconv localbase ncurses
 CPE_VENDOR=	minicom_project
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-dfl-baud=57600 \
 		--enable-dfl-port=/dev/cuau0 \
 		--enable-lock-dir=/var/spool/lock \
 		--sysconfdir=${PREFIX}/etc/minicom
 LIBS+=		${ICONV_LIB} -lncurses
 
 USE_GITLAB=	yes
 GL_SITE=	https://salsa.debian.org/
 GL_ACCOUNT=	minicom-team
 GL_TAGNAME=	1fb24b4f8e22e5580da9e8d453d8e5c3a18aed6c
 
 OPTIONS_DEFINE=		DOCS NLS
 OPTIONS_SUB=		yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \
 		s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \
 		s@/rb@/lrb@;s@/rx@/lrx@" ${WRKSRC}/src/rwconf.c
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}/
 	(umask 022 && cd ${WRKSRC} && ${TAR} --exclude '*/Makefile*' \
 		 --exclude '*.orig' -chf - extras doc | ${TAR}  -xf - -C \
 		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index bfaceb782211..278b7524bb86 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -1,73 +1,73 @@
 bin/minicom
 bin/xminicom
 bin/runscript
 bin/ascii-xfr
 @dir %%ETCDIR%%
-man/man1/minicom.1.gz
-man/man1/runscript.1.gz
-man/man1/ascii-xfr.1.gz
-man/man1/xminicom.1.gz
+share/man/man1/minicom.1.gz
+share/man/man1/runscript.1.gz
+share/man/man1/ascii-xfr.1.gz
+share/man/man1/xminicom.1.gz
 %%NLS%%share/locale/cs/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/da/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/de/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/es/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/id/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/minicom.mo
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.78
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.82
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.82.1
 %%PORTDOCS%%%%DOCSDIR%%/doc/Announce-1.83
 %%PORTDOCS%%%%DOCSDIR%%/doc/COMPATABILITY.lrzsz
 %%PORTDOCS%%%%DOCSDIR%%/doc/ChangeLog.old
 %%PORTDOCS%%%%DOCSDIR%%/doc/HistSearch
 %%PORTDOCS%%%%DOCSDIR%%/doc/Locales
 %%PORTDOCS%%%%DOCSDIR%%/doc/Macros
 %%PORTDOCS%%%%DOCSDIR%%/doc/QuickStart.modemu
 %%PORTDOCS%%%%DOCSDIR%%/doc/README.lrzsz
 %%PORTDOCS%%%%DOCSDIR%%/doc/TODO.lrzsz
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.175
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.Irix.dif
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.emacskey.dif
 %%PORTDOCS%%%%DOCSDIR%%/doc/Todo.fsel
 %%PORTDOCS%%%%DOCSDIR%%/doc/copyright.modemu
 %%PORTDOCS%%%%DOCSDIR%%/doc/fselector.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/japanese
 %%PORTDOCS%%%%DOCSDIR%%/doc/minicom.FAQ
 %%PORTDOCS%%%%DOCSDIR%%/doc/minirc.dfl
 %%PORTDOCS%%%%DOCSDIR%%/doc/modemu.README
 %%PORTDOCS%%%%DOCSDIR%%/doc/pl-translation.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/portugues-brasil
 %%PORTDOCS%%%%DOCSDIR%%/doc/suomeksi
 %%PORTDOCS%%%%DOCSDIR%%/extras/htsalogin
 %%PORTDOCS%%%%DOCSDIR%%/extras/linux/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/extras/linux/README-FIRST
 %%PORTDOCS%%%%DOCSDIR%%/extras/linux/mtelnet
 %%PORTDOCS%%%%DOCSDIR%%/extras/saralogin
 %%PORTDOCS%%%%DOCSDIR%%/extras/scriptdemo
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.iso
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.noconv
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.pc8
 %%PORTDOCS%%%%DOCSDIR%%/extras/tables/mc.sf7
 %%PORTDOCS%%%%DOCSDIR%%/extras/termcap/README
 %%PORTDOCS%%%%DOCSDIR%%/extras/termcap/termcap.long
 %%PORTDOCS%%%%DOCSDIR%%/extras/termcap/termcap.short
 %%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/README
 %%PORTDOCS%%%%DOCSDIR%%/extras/terminfo/minicom
 %%PORTDOCS%%%%DOCSDIR%%/extras/unixlogin