diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 675d7f8af971..18d7b4b27c66 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -1,73 +1,74 @@
 PORTNAME=	afterstep
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	LOCAL/dinoex
 PKGNAMESUFFIX=	1${PKGNAMESUFFIX2}
 DISTNAME=	AfterStep-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Window manager originally based on the Bowman NeXTstep clone
 WWW=		http://www.afterstep.org/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	asclock:x11-clocks/asclock
 
 CONFLICTS?=	afterstep-2*
 PORTSCOUT=	limit:^1\.[0-9.]*$$
 
 USES=		imake xorg
 USE_XORG=	xpm xext x11
 USE_CSTD=	gnu89
+MAKE_ARGS+=	MANPATH="${PREFIX}/share/man"
 INSTALL_TARGET=	install install.man
 CFLAGS+=	-Wno-return-type
 
 SRCDIRS=	afterstep \
 		modules/Animate modules/Audio modules/Auto \
 		modules/Banner modules/Pager modules/Wharf \
 		modules/Wharf/ASSound
 
 OPTIONS_DEFINE=	HICOLOR_ICONS
 OPTIONS_DEFAULT=	HICOLOR_ICONS
 HICOLOR_ICONS_DESC=	Use hi-color icons
 
 .include <bsd.port.options.mk>
 
 post-patch:
 		${REINPLACE_CMD} \
 			-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 			-e 's|%%PREFIX%%|${PREFIX}|g' \
 			${WRKSRC}/configure.h \
 			${WRKSRC}/sample.steprc
 		@ for i in ${SRCDIRS}; do \
 			( cd ${WRKSRC}/$$i; \
 			${MV} Imakefile Imakefile.orig; \
 			${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig  >  Imakefile; ) \
 		done
 
 pre-build:
 		(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles)
 
 post-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/
 		${INSTALL_DATA} ${WRKSRC}/backgrounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/
 		${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/
 		${MKDIR} ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 .if ${PORT_OPTIONS:MHICOLOR_ICONS}
 		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 		${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 .else
 		@for i in AFstep.xpm penguin.xpm monitor_bsd.xpm; do \
 			${CP} ${FILESDIR}/$$i ${WRKSRC}/icons/8bit/; \
 		done
 		${INSTALL_DATA} ${WRKSRC}/icons/8bit/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 		${INSTALL_DATA} ${WRKSRC}/icons/eyecon.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 .endif
 		${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/
 		@for i in CHANGES CREDITS README README.8bit INSTALL FAQ module-interface.txt; do \
 			${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${PREFIX}/lib/X11/afterstep/doc/; \
 		done
 
 .include <bsd.port.mk>
diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist
index bb76e181e0c6..6d61fdb869a2 100644
--- a/x11-wm/afterstep/pkg-plist
+++ b/x11-wm/afterstep/pkg-plist
@@ -1,64 +1,64 @@
 bin/afterstep
 include/X11/pixmaps/3dpaint.xpm
 include/X11/pixmaps/AFstep.xpm
 include/X11/pixmaps/AfterStep.xpm
 include/X11/pixmaps/FileFolders.xpm
 include/X11/pixmaps/KeysOnChain.xpm
 include/X11/pixmaps/OldFashionedRadio.xpm
 include/X11/pixmaps/YellowBlueRedGeometry.xpm
 include/X11/pixmaps/eyecon.xpm
 include/X11/pixmaps/interface.xpm
 include/X11/pixmaps/monalisa.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/monitor_bsd.xpm
 include/X11/pixmaps/netscape3.xpm
 include/X11/pixmaps/penguin.xpm
 include/X11/pixmaps/recycler.xpm
 include/X11/pixmaps/shutdown.xpm
 include/X11/pixmaps/text.xpm
 include/X11/pixmaps/writeletter.xpm
 lib/X11/afterstep/Animate
 lib/X11/afterstep/Audio
 lib/X11/afterstep/Auto
 lib/X11/afterstep/Banner
 lib/X11/afterstep/Pager
 lib/X11/afterstep/Wharf
 lib/X11/afterstep/backgrounds/bark.jpg
 lib/X11/afterstep/backgrounds/brick.jpg
 lib/X11/afterstep/backgrounds/carpet.green.jpg
 lib/X11/afterstep/backgrounds/coins.jpg
 lib/X11/afterstep/backgrounds/darkwood.jpg
 lib/X11/afterstep/backgrounds/eyes.jpg
 lib/X11/afterstep/backgrounds/glass.jpg
 lib/X11/afterstep/backgrounds/parquet.jpg
 lib/X11/afterstep/backgrounds/pebbles.jpg
 lib/X11/afterstep/backgrounds/rock.tile.jpg
 lib/X11/afterstep/backgrounds/rope.weave.jpg
 lib/X11/afterstep/backgrounds/stucco.jpg
 lib/X11/afterstep/backgrounds/tile.check.jpg
 lib/X11/afterstep/backgrounds/volcanic.jpg
 lib/X11/afterstep/backgrounds/wood.jpg
 lib/X11/afterstep/doc/CHANGES
 lib/X11/afterstep/doc/CREDITS
 lib/X11/afterstep/doc/FAQ
 lib/X11/afterstep/doc/INSTALL
 lib/X11/afterstep/doc/README
 lib/X11/afterstep/doc/README.8bit
 lib/X11/afterstep/doc/module-interface.txt
 lib/X11/afterstep/sounds/bong.au
 lib/X11/afterstep/sounds/clink.au
 lib/X11/afterstep/sounds/cowbell.au
 lib/X11/afterstep/sounds/crash.au
 lib/X11/afterstep/sounds/drip.au
 lib/X11/afterstep/sounds/gong.au
 lib/X11/afterstep/sounds/meepmeep.au
 lib/X11/afterstep/sounds/small-step.au
 lib/X11/afterstep/sounds/train.au
 lib/X11/afterstep/system.steprc
-man/man1/afterstep.1.gz
-man/man1/Animate.1.gz
-man/man1/Audio.1.gz
-man/man1/Auto.1.gz
-man/man1/Banner.1.gz
-man/man1/Pager.1.gz
-man/man1/Wharf.1.gz
+share/man/man1/afterstep.1.gz
+share/man/man1/Animate.1.gz
+share/man/man1/Audio.1.gz
+share/man/man1/Auto.1.gz
+share/man/man1/Banner.1.gz
+share/man/man1/Pager.1.gz
+share/man/man1/Wharf.1.gz