diff --git a/net/nncp/Makefile b/net/nncp/Makefile
index 97eb286b9bcb..14bff9630d25 100644
--- a/net/nncp/Makefile
+++ b/net/nncp/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	nncp
 DISTVERSION=	8.13.0
 PORTREVISION=	14
 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:modules,no_targets tar:xz
 
 USE_RC_SUBR=	nncp-caller nncp-daemon nncp-toss
 
-SUB_FILES=	pkg-message pkg-install pkg-deinstall
+SUB_FILES=	pkg-deinstall pkg-install pkg-message
 
 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
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/net/nncp/files/patch-build-cflags b/net/nncp/files/patch-build-cflags
new file mode 100644
index 000000000000..b9959a9049b4
--- /dev/null
+++ b/net/nncp/files/patch-build-cflags
@@ -0,0 +1,16 @@
+--- build.orig	1981-01-01 00:00:00 UTC
++++ build
+@@ -11,11 +11,11 @@ GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultLogPath=$LOGPAT
+ GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSendmailPath=$SENDMAIL"
+ GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultSpoolPath=$SPOOLPATH"
+ GO_LDFLAGS="$GO_LDFLAGS -X $mod.DefaultLogPath=$LOGPATH"
+-$GO build $vendor -o ../bin/nncp $GO_CFLAGS -ldflags "$GO_LDFLAGS" ./cmd/nncp
++$GO build $vendor -o ../bin/nncp -ldflags "$GO_LDFLAGS" ./cmd/nncp
+ 
+ hjsonVersion=v$(sed -n "s/^.*hjson-go.* v\(.*\)$/\1/p" <go.mod)
+ GO_LDFLAGS="$GO_LDFLAGS -X main.Version=$hjsonVersion"
+-$GO build $vendor -o ../bin/hjson-cli $GO_CFLAGS -ldflags "$GO_LDFLAGS" \
++$GO build $vendor -o ../bin/hjson-cli -ldflags "$GO_LDFLAGS" \
+     github.com/hjson/hjson-go/v4/hjson-cli
+ 
+ cd ../bin