diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index eea79adcd344..ec00b6520a18 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,36 +1,38 @@
 PORTNAME=	nano
 DISTVERSION=	7.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://www.nano-editor.org/dist/v${DISTVERSION:R:R}/ GNU
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Nano's ANOther editor, an enhanced free Pico clone
 WWW=		https://www.nano-editor.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		charsetfix ncurses pkgconfig tar:xz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} --enable-utf8
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} --enable-utf8 --mandir=${PREFIX}/share
 MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
 PORTSCOUT=	limitw:1,even
 INFO=		nano
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 NLS_USES=		gettext localbase
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/^groff.*/false/' ${WRKSRC}/configure
 
 post-install-DOCS-on:
 .for doc in nano.1.html rnano.1.html nanorc.5.html
 	${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.nanorc ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/nano/pkg-plist b/editors/nano/pkg-plist
index 8e1b6d9ec59a..b2be6e80ad5f 100644
--- a/editors/nano/pkg-plist
+++ b/editors/nano/pkg-plist
@@ -1,94 +1,94 @@
 bin/nano
 bin/rnano
-man/man1/nano.1.gz
-man/man1/rnano.1.gz
-man/man5/nanorc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/nano.1.html
 %%PORTDOCS%%%%DOCSDIR%%/nano.html
 %%PORTDOCS%%%%DOCSDIR%%/nanorc.5.html
 %%PORTDOCS%%%%DOCSDIR%%/rnano.1.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.nanorc
 %%NLS%%share/locale/bg/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/da/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/de/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/es/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/id/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/is/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/it/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/nano.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/nano.mo
+share/man/man1/nano.1.gz
+share/man/man1/rnano.1.gz
+share/man/man5/nanorc.5.gz
 %%DATADIR%%/asm.nanorc
 %%DATADIR%%/autoconf.nanorc
 %%DATADIR%%/awk.nanorc
 %%DATADIR%%/c.nanorc
 %%DATADIR%%/changelog.nanorc
 %%DATADIR%%/cmake.nanorc
 %%DATADIR%%/css.nanorc
 %%DATADIR%%/default.nanorc
 %%DATADIR%%/elisp.nanorc
 %%DATADIR%%/email.nanorc
 %%DATADIR%%/extra/ada.nanorc
 %%DATADIR%%/extra/fortran.nanorc
 %%DATADIR%%/extra/haskell.nanorc
 %%DATADIR%%/extra/povray.nanorc
 %%DATADIR%%/extra/spec.nanorc
 %%DATADIR%%/go.nanorc
 %%DATADIR%%/groff.nanorc
 %%DATADIR%%/guile.nanorc
 %%DATADIR%%/html.nanorc
 %%DATADIR%%/java.nanorc
 %%DATADIR%%/javascript.nanorc
 %%DATADIR%%/json.nanorc
 %%DATADIR%%/lua.nanorc
 %%DATADIR%%/makefile.nanorc
 %%DATADIR%%/man.nanorc
 %%DATADIR%%/markdown.nanorc
 %%DATADIR%%/nanohelp.nanorc
 %%DATADIR%%/nanorc.nanorc
 %%DATADIR%%/nftables.nanorc
 %%DATADIR%%/objc.nanorc
 %%DATADIR%%/ocaml.nanorc
 %%DATADIR%%/patch.nanorc
 %%DATADIR%%/perl.nanorc
 %%DATADIR%%/php.nanorc
 %%DATADIR%%/po.nanorc
 %%DATADIR%%/python.nanorc
 %%DATADIR%%/ruby.nanorc
 %%DATADIR%%/rust.nanorc
 %%DATADIR%%/sh.nanorc
 %%DATADIR%%/sql.nanorc
 %%DATADIR%%/tcl.nanorc
 %%DATADIR%%/tex.nanorc
 %%DATADIR%%/texinfo.nanorc
 %%DATADIR%%/xml.nanorc
 %%DATADIR%%/yaml.nanorc