diff --git a/news/nn/Makefile b/news/nn/Makefile
index b64174c9f80e..2495d85c1773 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,34 +1,27 @@
 # Created by: adam
 # $FreeBSD$
 
 PORTNAME=	nn
 PORTVERSION=	6.7.3
 PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	http://www.sourcefiles.org/Internet/News/Usenet_Clients/  \
 		http://www.wa.apana.org.au/~dean/sources/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Newsreader
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -Iconf" LDFLAGS="${LDFLAGS} -s"
 
-MAN1=		nn.1 nncheck.1 nngoback.1 nngrab.1  nngrep.1 nnpost.1 \
-		nntidy.1 nnview.1 nnacct.1m nnadmin.1m nnstats.1m nnusage.1m
-MAN8=		nnmaster.8 nnspew.8
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 pre-patch:
 	@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed
 
 pre-build:
-	@${CAT} ${WRKSRC}/config.h.unparsed | ${SED} -e "s#SUB_PREFIX#${PREFIX}#" \
-	    | ${SED} -e "s#SUB_MANPREFIX#${MANPREFIX}#" > ${WRKSRC}/config.h
+	@${SED} 's#SUB_PREFIX#${PREFIX}#; s#SUB_MANPREFIX#${MANPREFIX}#' \
+		${WRKSRC}/config.h.unparsed > ${WRKSRC}/config.h
 
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL
+post-build:
+	@${REINPLACE_CMD} 's#${PREFIX}#$${DESTDIR}&#' ${WRKSRC}/inst
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/news/nn/pkg-install b/news/nn/pkg-install
index f796ec9c3cf5..3464fa390e52 100644
--- a/news/nn/pkg-install
+++ b/news/nn/pkg-install
@@ -1,64 +1,65 @@
 #!/bin/sh
 
 if [ "x$2" != "xPOST-INSTALL" ]; then
 	exit
 fi
 
 cat << xxENDxx
+
 *******************************************************************
 You have just installed the $1 package
 
 Please set your NNTP server address or hostname in the file:
 
 xxENDxx
 
 echo "${PKG_PREFIX}/etc/nntp_server"
 echo ""
 
 cat << xxENDxx
 If desired, please set your domain name for From: addresses when
 posting in the file (default is to use your hostname):
 
 xxENDxx
 
 echo "${PKG_PREFIX}/etc/nntp_domain"
 echo ""
 
 cat << xxENDxx
 *******************************************************************
 xxENDxx
 
 cat << xxENDxx > ${PKG_PREFIX}/etc/nntp_server.dist
 # nntp_server: Configuration file for NN newsreader
 # 
 # Set your NNTP server address or hostname in this file.
 #
 # If this file is left blank, NN will use the server set in the
 # NNTP_SERVER environment variable.
 #
 # news.myisp.com
 xxENDxx
 
 if [ ! -e ${PKG_PREFIX}/etc/nntp_server ]; then
 	cp ${PKG_PREFIX}/etc/nntp_server.dist ${PKG_PREFIX}/etc/nntp_server
 fi
 
 cat << xxENDxx > ${PKG_PREFIX}/etc/nntp_domain.dist
 # nntp_domain: Configuration file for NN newsreader
 # 
 # Set the default domain name portion of user e-mail addresses as you
 # would like them to appear in the From: line of articles posted
 # with NN.
 #
 # For example, setting the name to foobar.com in this file will cause
 # the From: line for joeuser to look like something like this:
 #
 # From: joeuser@foobar.com (Joe User)
 #
 # If this file is left blank, NN will use the hostname of this
 # computer as the From: domain name.
 xxENDxx
 
 if [ ! -e ${PKG_PREFIX}/etc/nntp_domain ]; then
 	cp ${PKG_PREFIX}/etc/nntp_domain.dist ${PKG_PREFIX}/etc/nntp_domain
 fi
diff --git a/news/nn/pkg-plist b/news/nn/pkg-plist
index ca9486ef858e..76b597034c3e 100644
--- a/news/nn/pkg-plist
+++ b/news/nn/pkg-plist
@@ -1,41 +1,52 @@
 bin/nn
 bin/nnusage
 bin/nngrab
 bin/nnstats
 bin/nncheck
 bin/nnadmin
 bin/nntidy
 bin/nngoback
 bin/nngrep
 bin/nnpost
 bin/nnbatch
 bin/nnview
 @unexec if cmp -s %D/etc/nntp_domain %D/etc/nntp_domain.dist; then rm -f %D/etc/nntp_domain; fi
-etc/nntp_domain.dist
-@exec [ -f %B/nntp_domain ] || cp %B/%f %B/nntp_domain
 @unexec if cmp -s %D/etc/nntp_server %D/etc/nntp_server.dist; then rm -f %D/etc/nntp_server; fi
-etc/nntp_server.dist
-@exec [ -f %B/nntp_server ] || cp %B/%f %B/nntp_server
+@unexec rm -f %D/etc/nntp_domain.dist %D/etc/nntp_server.dist
 lib/nn/aux
 lib/nn/upgrade_rc
 lib/nn/conf
 lib/nn/help/adm.upgrade1
 lib/nn/help/adm.upgrade2
 lib/nn/help/adm.upgrade3
 lib/nn/help/adm.upgrade4
 lib/nn/help/adm.welcome
 lib/nn/help/help.attr
 lib/nn/help/help.commands
 lib/nn/help/help.extended
 lib/nn/help/help.help
 lib/nn/help/help.map
 lib/nn/help/help.menu
 lib/nn/help/help.more
 lib/nn/help/help.read
 lib/nn/help/help.set
 lib/nn/help/help.show
 lib/nn/help/help.sort
 lib/nn/help/help.variables
 lib/nn/help/Manual
+man/man1/nn.1.gz
+man/man1/nnacct.1m.gz
+man/man1/nnadmin.1m.gz
+man/man1/nncheck.1.gz
+man/man1/nngoback.1.gz
+man/man1/nngrab.1.gz
+man/man1/nngrep.1.gz
+man/man1/nnpost.1.gz
+man/man1/nnstats.1m.gz
+man/man1/nntidy.1.gz
+man/man1/nnusage.1m.gz
+man/man1/nnview.1.gz
+man/man8/nnmaster.8.gz
+man/man8/nnspew.8.gz
 @dirrm lib/nn/help
 @dirrm lib/nn