diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index c51a5fb55e21..efe7c63a0c94 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	cscout
 PORTVERSION=	3.01
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	dds@FreeBSD.org
 COMMENT=	Source code analyzer and refactoring browser for C program collections
 WWW=		https://www.spinellis.gr/cscout/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	unzip:archivers/unzip
 RUN_DEPENDS=	dot:graphics/graphviz
 
 USES=		compiler:c++11-lang gmake perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	dspinellis dspinellis:swill,btyacc
 GH_PROJECT=	cscout swill:swill btyacc:btyacc
 GH_TAGNAME=	bd7dfac fafde76:swill 4d0be15:btyacc
 GH_SUBDIR=	swill:swill btyacc:btyacc
 USE_PERL5=	run build
 SHEBANG_FILES=	src/csmake.pl src/cswc.pl
 
 # DOCS temporary disabled, need XML -> HTML conversion
 OPTIONS_DEFINE=	EXAMPLES #DOCS
 SUB_FILES=	pkg-message
 
 post-patch:
 	${REINPLACE_CMD} -e 's|install -d \"|install -d \"${STAGEDIR}/|g' ${WRKSRC}/src/Makefile
 	${REINPLACE_CMD} -e 's|install -Ds $$< \"|install -s $$< \"${STAGEDIR}/|g' ${WRKSRC}/src/Makefile
 	${REINPLACE_CMD} -e 's|./dest-install.sh \"|./dest-install.sh \"${STAGEDIR}/|g' ${WRKSRC}/src/Makefile
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/man/cscout.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/cswc.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/cscc.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/csmake.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/cscout.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/cswc.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/cscc.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/csmake.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 #do-install-DOCS-on:
 #	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/cscout/pkg-plist b/devel/cscout/pkg-plist
index 4b7ea40da46e..3d36269da80e 100644
--- a/devel/cscout/pkg-plist
+++ b/devel/cscout/pkg-plist
@@ -1,63 +1,63 @@
 bin/cscc
 bin/cscout
 bin/csmake
 bin/cswc
 include/cscout/csmake-post-defs.h
 include/cscout/csmake-pre-defs.h
 include/cscout/host-defs.h
 include/cscout/host-incs.h
 include/cscout/stdc-defs.h
 include/cscout/stdc-incs.h
 include/cscout/stdc/_ansi.h
 include/cscout/stdc/assert.h
 include/cscout/stdc/complex.h
 include/cscout/stdc/ctype.h
 include/cscout/stdc/errno.h
 include/cscout/stdc/float.h
 include/cscout/stdc/limits.h
 include/cscout/stdc/locale.h
 include/cscout/stdc/math.h
 include/cscout/stdc/setjmp.h
 include/cscout/stdc/signal.h
 include/cscout/stdc/stdarg.h
 include/cscout/stdc/stddef.h
 include/cscout/stdc/stdio.h
 include/cscout/stdc/stdlib.h
 include/cscout/stdc/string.h
 include/cscout/stdc/time.h
-man/man1/cscc.1.gz
-man/man1/cscout.1.gz
-man/man1/csmake.1.gz
-man/man1/cswc.1.gz
+share/man/man1/cscc.1.gz
+share/man/man1/cscout.1.gz
+share/man/man1/csmake.1.gz
+share/man/man1/cswc.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.cscout/host-defs.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.cscout/host-incs.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.cscout/options
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk.cs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk.prj
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/FIXES
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/awk.1
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/awk.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/awkgram.y
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/b.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/buildwin.bat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/lex.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/lib.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/mac.code
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/main.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/makefile.win
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/maketab.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/missing95.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/parse.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/proctab.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/proto.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/run.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/tran.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytab.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytab.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytabc.bak
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytabh.bak
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin.prj
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sh.prj