diff --git a/sysutils/cw/Makefile b/sysutils/cw/Makefile
index c23ee151ca9c..47c7682ad5fd 100644
--- a/sysutils/cw/Makefile
+++ b/sysutils/cw/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	cw
 PORTVERSION=	1.0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cwrapper.sourceforge.net/ \
 		http://www.fakehalo.us/cw/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Non-intrusive color wrapper for common commands
 WWW=		https://cwrapper.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		shebangfix
 
 CONFLICTS_INSTALL=	unixcw # bin/cw
 
 SHEBANG_FILES=	def/*
 SHEBANG_LANG=	cw
 cw_OLD_CMD=	/cw
 cw_CMD=		${PREFIX}/bin/cw
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 ALL_TARGET=	local
 
 PORTDOCS=	CHANGES CONTRIB README
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 .for file in cw cwu
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/cw/pkg-plist b/sysutils/cw/pkg-plist
index 5293b75ba388..85d73c11c0fc 100644
--- a/sysutils/cw/pkg-plist
+++ b/sysutils/cw/pkg-plist
@@ -1,126 +1,126 @@
 bin/color
 bin/colorcfg
 bin/cw
 bin/cwe
 bin/cwu
 lib/cw/arp
 lib/cw/arping
 lib/cw/auth.log@
 lib/cw/blockdev
 lib/cw/cal
 lib/cw/cksum
 lib/cw/clock
 lib/cw/configure
 lib/cw/cpuinfo@
 lib/cw/crontab@
 lib/cw/cw-pipe
 lib/cw/cw-test.cgi
 lib/cw/date
 lib/cw/df
 lib/cw/diff
 lib/cw/dig
 lib/cw/dmesg
 lib/cw/du
 lib/cw/env
 lib/cw/etc/1line-blu.ftr
 lib/cw/etc/1line-blu.hdr
 lib/cw/etc/1line-cyn.ftr
 lib/cw/etc/1line-cyn.hdr
 lib/cw/etc/1line-grn.ftr
 lib/cw/etc/1line-grn.hdr
 lib/cw/etc/1line-gry.ftr
 lib/cw/etc/1line-gry.hdr
 lib/cw/etc/1line-grydash.ftr
 lib/cw/etc/1line-grydash.hdr
 lib/cw/etc/1line-gryfade.ftr
 lib/cw/etc/1line-gryfade.hdr
 lib/cw/etc/1line-prp.ftr
 lib/cw/etc/1line-prp.hdr
 lib/cw/etc/1line-red.ftr
 lib/cw/etc/1line-red.hdr
 lib/cw/etc/1line-ylw.ftr
 lib/cw/etc/1line-ylw.hdr
 lib/cw/etc/README
 lib/cw/etc/bendingbars.ftr
 lib/cw/etc/bendingbars.hdr
 lib/cw/etc/chrome.ftr
 lib/cw/etc/chrome.hdr
 lib/cw/etc/goop-cyngrn.ftr
 lib/cw/etc/goop-cyngrn.hdr
 lib/cw/etc/goop-redprp.ftr
 lib/cw/etc/goop-redprp.hdr
 lib/cw/figlet
 lib/cw/file
 lib/cw/find
 lib/cw/finger
 lib/cw/free
 lib/cw/fstab@
 lib/cw/fuser
 lib/cw/g++
 lib/cw/gcc
 lib/cw/group@
 lib/cw/groups
 lib/cw/hdparm
 lib/cw/hexdump
 lib/cw/host
 lib/cw/hosts@
 lib/cw/id
 lib/cw/ifconfig
 lib/cw/inittab@
 lib/cw/iptables
 lib/cw/last
 lib/cw/lastlog
 lib/cw/lsattr
 lib/cw/lsmod
 lib/cw/lsof
 lib/cw/ltrace-color
 lib/cw/make
 lib/cw/md5sum
 lib/cw/meminfo@
 lib/cw/messages@
 lib/cw/mount
 lib/cw/mpg123
 lib/cw/netstat
 lib/cw/nfsstat
 lib/cw/nmap
 lib/cw/nslookup
 lib/cw/objdump
 lib/cw/passwd@
 lib/cw/ping
 lib/cw/pmap
 lib/cw/pmap_dump
 lib/cw/praliases
 lib/cw/profile@
 lib/cw/protocols@
 lib/cw/ps
 lib/cw/pstree
 lib/cw/quota
 lib/cw/quotastats
 lib/cw/resolv.conf@
 lib/cw/route
 lib/cw/routel
 lib/cw/sdiff
 lib/cw/services@
 lib/cw/showmount
 lib/cw/smbstatus
 lib/cw/stat
 lib/cw/strace-color
 lib/cw/sysctl
 lib/cw/syslog
 lib/cw/tar
 lib/cw/tcpdump
 lib/cw/tracepath
 lib/cw/traceroute
 lib/cw/umount
 lib/cw/uname
 lib/cw/uptime
 lib/cw/users
 lib/cw/vmstat
 lib/cw/w
 lib/cw/wc
 lib/cw/whereis
 lib/cw/who
 lib/cw/xferlog@
-man/man1/cw.1.gz
-man/man1/cwe.1.gz
-man/man1/cwu.1.gz
+share/man/man1/cw.1.gz
+share/man/man1/cwe.1.gz
+share/man/man1/cwu.1.gz