diff --git a/www/nostromo/Makefile b/www/nostromo/Makefile
index 2e9c7f6659b6..9ccefa53f193 100644
--- a/www/nostromo/Makefile
+++ b/www/nostromo/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	nostromo
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.nazgul.ch/dev/
 
 MAINTAINER=	loox@e-shell.net
 COMMENT=	Fast, secure HTTP/1.1 CGI/1.1 SSL IPv4/IPv6 web server
 WWW=		http://www.nazgul.ch/dev_nostromo.html
 
 LICENSE=	ISCL
 
 NOSTROMO_DIR?=		nostromo
 NOSTROMO_LOGDIR?=	${NOSTROMO_DIR}/logs
 NOSTROMO_LOGDIR_PERMS?=	0775
 
 USE_RC_SUBR=	nostromo
 USES=		uidfix ssl
 
-MAKE_ENV?=	MAKEOBJDIR=. NOSTROMO_DIR=${NOSTROMO_DIR} MANDIR=${PREFIX}/man/man
+MAKE_ENV?=	MAKEOBJDIR=. NOSTROMO_DIR=${NOSTROMO_DIR} MANDIR=${PREFIX}/share/man/man
 PLIST_SUB+=	NOSTROMODIR="${NOSTROMO_DIR}" NOSTROMOLOGDIR="${NOSTROMO_LOGDIR}"
 
 # XXX PIE with static libraries is currently unsupported.
 MAKE_ENV+=	WITHOUT_PIE=true
 
 post-extract:
 	@${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \
 		${WRKSRC}/src/nhttpd/nhttpd.8	\
 		${WRKSRC}/src/nhttpd/main.c	\
 		${WRKSRC}/conf/nhttpd.conf-dist
 	@${REINPLACE_CMD} -e "s@/var/nostromo@${STAGEDIR}${PREFIX}/${NOSTROMO_DIR}@g" \
 		-e "s@-o [^ ]* -g [^ ]*@ -o ${BINOWN} -g ${BINGRP}@" \
 		-e 's@conf-dist$$@conf.sample@'	\
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/www/nostromo/pkg-plist b/www/nostromo/pkg-plist
index fbf1d44fe8bd..c3019b9ebab2 100644
--- a/www/nostromo/pkg-plist
+++ b/www/nostromo/pkg-plist
@@ -1,11 +1,11 @@
-man/man8/nhttpd.8.gz
 sbin/crypt
 sbin/nhttpd
+share/man/man8/nhttpd.8.gz
 %%NOSTROMODIR%%/conf/mimes
 @sample %%NOSTROMODIR%%/conf/nhttpd.conf.sample
 %%NOSTROMODIR%%/htdocs/index.html
 %%NOSTROMODIR%%/htdocs/nostromo.gif
 %%NOSTROMODIR%%/htdocs/cgi-bin/printenv
 %%NOSTROMODIR%%/icons/dir.gif
 %%NOSTROMODIR%%/icons/file.gif
 @dir(,,775) %%NOSTROMOLOGDIR%%