diff --git a/net/nncp/Makefile b/net/nncp/Makefile
index e07dd68c8563..2bbe2330f7b1 100644
--- a/net/nncp/Makefile
+++ b/net/nncp/Makefile
@@ -1,32 +1,41 @@
 PORTNAME=	nncp
-DISTVERSION=	8.8.3
+DISTVERSION=	8.13.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
 MAINTAINER=	stargrave@stargrave.org
 COMMENT=	Utilities for secure store-and-forward files, mail, command exchanging
 WWW=		http://www.nncpgo.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		go:1.21,modules,no_targets tar:xz
+USES=		go:modules,no_targets tar:xz
 
 USE_RC_SUBR=	nncp-caller nncp-daemon nncp-toss
 
-MAKE_ARGS=	INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH}
-MAKE_ENV=	${GO_ENV}
-INSTALL_TARGET=	install-strip
-
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 
 INFO=		nncp
 PORTDOCS=	AUTHORS NEWS NEWS.RU README README.RU THANKS
 
 OPTIONS_DEFINE=	DOCS
 
+do-build:
+	GO=${GO_CMD} ${GO_ENV} GO_CFLAGS="${GO_BUILDFLAGS}" \
+		CFGPATH=${PREFIX}/etc/nncp.hjson \
+		INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
+		PREFIX=${STAGEDIR}${PREFIX} \
+		GOCACHE="${WRKDIR}/.cache" ${WRKSRC}/build
+
+do-install:
+	PREFIX=${STAGEDIR}${PREFIX} INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} \
+		${WRKSRC}/install
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
-	${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/nncp.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample \
+		${STAGEDIR}${PREFIX}/etc/nncp.conf.sample
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/net/nncp/distinfo b/net/nncp/distinfo
index be44330c42cb..396067c2036c 100644
--- a/net/nncp/distinfo
+++ b/net/nncp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1758765432
-SHA256 (nncp-8.8.3.tar.xz) = 225750084747e970d82be0d6e6507fe47145146baad670e40b011a568eef22f1
-SIZE (nncp-8.8.3.tar.xz) = 1822068
+TIMESTAMP = 1759061549
+SHA256 (nncp-8.13.0.tar.xz) = 8ce3680e98005198d8975e031760b3a9b33be6d2d61844c799f778ca233d05f4
+SIZE (nncp-8.13.0.tar.xz) = 2662700
diff --git a/net/nncp/pkg-plist b/net/nncp/pkg-plist
index e89c748f3046..d29cc7b61bcb 100644
--- a/net/nncp/pkg-plist
+++ b/net/nncp/pkg-plist
@@ -1,25 +1,26 @@
+bin/nncp
 bin/nncp-ack
 bin/nncp-bundle
 bin/nncp-call
 bin/nncp-caller
 bin/nncp-cfgdir
 bin/nncp-cfgenc
 bin/nncp-cfgmin
 bin/nncp-cfgnew
 bin/nncp-check
 bin/nncp-cronexpr
 bin/nncp-daemon
 bin/nncp-exec
 bin/nncp-file
 bin/nncp-freq
 bin/nncp-hash
 bin/nncp-log
 bin/nncp-pkt
 bin/nncp-reass
 bin/nncp-rm
 bin/nncp-stat
 bin/nncp-toss
 bin/nncp-trns
 bin/nncp-xfer
 @dir etc/newsyslog.conf.d
 @sample etc/nncp.conf.sample etc/newsyslog.conf.d/nncp.conf