diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 6604971fc11f..e211989dd373 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	nano
-DISTVERSION=	8.6
+DISTVERSION=	8.7
 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
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} --enable-utf8 --mandir=${PREFIX}/share
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} --enable-utf8
 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/distinfo b/editors/nano/distinfo
index c660ac2d8e65..349c8c1f789b 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755766225
-SHA256 (nano-8.6.tar.xz) = f7abfbf0eed5f573ab51bd77a458f32d82f9859c55e9689f819d96fe1437a619
-SIZE (nano-8.6.tar.xz) = 1707688
+TIMESTAMP = 1763029363
+SHA256 (nano-8.7.tar.xz) = afd287aa672c48b8e1a93fdb6c6588453d527510d966822b687f2835f0d986e9
+SIZE (nano-8.7.tar.xz) = 1710220