diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 933113344a2e..9b1b8f77119e 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Uptime daemon
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
 LIBTOOLIZE_ARGS=--copy --force
 ACLOCAL_ARGS=	# empty
@@ -22,10 +22,6 @@ USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
-MAN1=		uprecords.1
-MAN8=		uptimed.8
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/lib/sendmail|/usr/sbin/sendmail| ; \
@@ -33,11 +29,11 @@ post-patch:
 		${WRKSRC}/etc/uptimed.conf-dist
 
 post-install:
-	@${MKDIR} ${PREFIX}/www/cgi-bin
-	(cd ${PREFIX}/bin && ${INSTALL_PROGRAM} uprecords \
-		${PREFIX}/www/cgi-bin/uprecords.cgi)
-	(cd ${WRKSRC}/sample-cgi && ${INSTALL_DATA} * \
-		${PREFIX}/www/cgi-bin)
-	@${MKDIR} /var/spool/uptimed
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/uprecords \
+		${STAGEDIR}${PREFIX}/www/cgi-bin/uprecords.cgi
+	${INSTALL_DATA} ${WRKSRC}/sample-cgi/* \
+		${STAGEDIR}${PREFIX}/www/cgi-bin
+	@${MKDIR} ${STAGEDIR}/var/spool/uptimed
 
 .include <bsd.port.mk>
diff --git a/sysutils/uptimed/pkg-plist b/sysutils/uptimed/pkg-plist
index e9d629767afc..3b28e937133f 100644
--- a/sysutils/uptimed/pkg-plist
+++ b/sysutils/uptimed/pkg-plist
@@ -5,6 +5,8 @@ lib/libuptimed.a
 lib/libuptimed.la
 lib/libuptimed.so
 lib/libuptimed.so.0
+man/man1/uprecords.1.gz
+man/man8/uptimed.8.gz
 sbin/uptimed
 www/cgi-bin/uprecords.cgi
 www/cgi-bin/uprecords.conf