diff --git a/misc/nnn/Makefile b/misc/nnn/Makefile
index 6820b1de35bc..f702223cae9e 100644
--- a/misc/nnn/Makefile
+++ b/misc/nnn/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	nnn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4
-PORTREVISION=	1
+DISTVERSION=	2.5
 CATEGORIES=	misc shells
 
 MAINTAINER=	dg@syrec.org
@@ -16,11 +15,13 @@ USES=		gmake localbase ncurses readline
 USE_GITHUB=	yes
 GH_ACCOUNT=	jarun
 
-MAKE_ARGS=	PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man LDLIBS_CURSES=-lncursesw
+MAKE_ARGS=	PREFIX=${PREFIX} MANPREFIX=${PREFIX}/man \
+		LDLIBS_CURSES=-lncursesw CFLAGS_OPTIMIZATION=
 CFLAGS+=	-D_WITH_DPRINTF # enable dprintf prototype
 
 OPTIONS_DEFINE=	ATOOL DOCS EXAMPLES MEDIAINFO XDG
 OPTIONS_DEFAULT=	ATOOL MEDIAINFO XDG
+
 ATOOL_DESC=	List and extract archives
 XDG_DESC=	Open files with xdg-open
 MEDIAINFO_DESC=	Show media information
@@ -55,9 +56,9 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "quitcd natool nlay" \
-		${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} user-scripts ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts
+	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} "clipboard-copier natool nlaunch nlay quitcd" \
+		${STAGEDIR}${EXAMPLESDIR}/scripts
+	cd ${WRKSRC} && ${COPYTREE_SHARE} plugins ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/nnn/distinfo b/misc/nnn/distinfo
index 82e71854d81e..aba3b99f2402 100644
--- a/misc/nnn/distinfo
+++ b/misc/nnn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552980168
-SHA256 (jarun-nnn-v2.4_GH0.tar.gz) = 859ba5bd4892016aed9a4830ee1e1b03eb74e94c4f1bd82f0288dc559f7327eb
-SIZE (jarun-nnn-v2.4_GH0.tar.gz) = 62510
+TIMESTAMP = 1559045903
+SHA256 (jarun-nnn-v2.5_GH0.tar.gz) = 3636f172a024de5c12420a80dbe3d006d42b5e0a17e70a527963c864af22655c
+SIZE (jarun-nnn-v2.5_GH0.tar.gz) = 71811