diff --git a/shells/bashc/Makefile b/shells/bashc/Makefile
index 3cf4beff333f..0bb01e0f93db 100644
--- a/shells/bashc/Makefile
+++ b/shells/bashc/Makefile
@@ -1,100 +1,102 @@
 PORTNAME=	bashc
 PORTVERSION=	5.1.8
+PORTREVISION=	1
 CATEGORIES=	shells
 
 MAINTAINER=	obscenum999@gmail.com
 COMMENT=	GNU Bourne Again shell extended with two-panel file manager
 WWW=		https://github.com/sergev/bash-commander
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		bison gmake iconv localbase makeinfo pathfix
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sergev
 GH_PROJECT=	bash-commander
 GH_TAGNAME=	240d2831b191f2ad686301751bf43251ae7259f3
 
 OPTIONS_DEFINE=	DOCS FDESCFS HELP NLS STATIC SYSBASHRC SYSLOG
 FDESCFS_DESC=	Enable use of /dev/fd
 HELP_DESC=	Enable builtin help
 SYSBASHRC_DESC=	Enable system-wide rc files
 
 OPTIONS_DEFAULT=	HELP
 
 FDESCFS_CONFIGURE_ENV_OFF=	bash_cv_dev_fd=absent
 
 HELP_CONFIGURE_ENABLE=	help-builtin
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 INFO=		bash
 
 PORTDOCS=	CHANGES COMPAT FAQ INTRO NEWS POSIX RBASH README bash.html \
 		bashref.html
 DOCSDIR=	${PREFIX}/share/doc/bash
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=	--disable-rpath \
 			--enable-disabled-builtins \
 			--with-libiconv-prefix=${ICONV_PREFIX} \
 			--without-bash-malloc
 
 CONFLICTS+=	bash bash-static
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
 CONFIGURE_ARGS+=	--enable-static-link
 LLD_UNSAFE=		yes
 .else
 CONFIGURE_ARGS+=	--disable-static-link
 # Bash symbols must be exported in order to link runtime plugins, i.e.,
 # "enable -f". (Plugins are not supported for bash-static.)
 LDFLAGS+=		-Wl,-export-dynamic
 .endif
 STANDARD_PATH=		/sbin:/bin:/usr/sbin:/usr/bin
 CPPFLAGS+=		-DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"' \
 			-DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"'
 
 post-patch:
 # Ensure y.tab.c is regenerated
 	${TOUCH} ${WRKSRC}/parse.y
 	${RM} ${WRKSRC}/y.tab.c
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
 .if ${PORT_OPTIONS:MSYSLOG}
 	@${REINPLACE_CMD} \
 	    -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \
 	    -e "s|/\*.*#define SYSLOG_SHOPT .*\*/|#define SYSLOG_SHOPT 1|g" \
 	    ${WRKSRC}/config-top.h
 .endif
 
 post-patch-SYSBASHRC-on:
 	@${REINPLACE_CMD} \
 		-e "s|.*\(#define SYS_BASH.*\)\(/etc/.*\"\).*|\1${PREFIX}\2|" \
 		${WRKSRC}/config-top.h
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
 
 pre-build:
 	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
 
 post-install:
 	${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/rbash
 	${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/bash
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
 		${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR}
 	for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \
 	done
 
 regress: build
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/shells/bashc/pkg-plist b/shells/bashc/pkg-plist
index 2a3148385e56..ad4328e2e6b6 100644
--- a/shells/bashc/pkg-plist
+++ b/shells/bashc/pkg-plist
@@ -1,141 +1,141 @@
 @shell bin/bash
 @shell bin/bashc
 @shell bin/rbash
 bin/bashbug
 etc/bash_commander
 etc/bash_dialog
 %%NO_STATIC%%include/bash/alias.h
 %%NO_STATIC%%include/bash/array.h
 %%NO_STATIC%%include/bash/arrayfunc.h
 %%NO_STATIC%%include/bash/assoc.h
 %%NO_STATIC%%include/bash/bashansi.h
 %%NO_STATIC%%include/bash/bashintl.h
 %%NO_STATIC%%include/bash/bashjmp.h
 %%NO_STATIC%%include/bash/bashtypes.h
 %%NO_STATIC%%include/bash/builtins.h
 %%NO_STATIC%%include/bash/builtins/bashgetopt.h
 %%NO_STATIC%%include/bash/builtins/builtext.h
 %%NO_STATIC%%include/bash/builtins/common.h
 %%NO_STATIC%%include/bash/builtins/getopt.h
 %%NO_STATIC%%include/bash/command.h
 %%NO_STATIC%%include/bash/config-bot.h
 %%NO_STATIC%%include/bash/config-top.h
 %%NO_STATIC%%include/bash/config.h
 %%NO_STATIC%%include/bash/conftypes.h
 %%NO_STATIC%%include/bash/dispose_cmd.h
 %%NO_STATIC%%include/bash/error.h
 %%NO_STATIC%%include/bash/externs.h
 %%NO_STATIC%%include/bash/general.h
 %%NO_STATIC%%include/bash/hashlib.h
 %%NO_STATIC%%include/bash/include/ansi_stdlib.h
 %%NO_STATIC%%include/bash/include/chartypes.h
 %%NO_STATIC%%include/bash/include/filecntl.h
 %%NO_STATIC%%include/bash/include/gettext.h
 %%NO_STATIC%%include/bash/include/maxpath.h
 %%NO_STATIC%%include/bash/include/memalloc.h
 %%NO_STATIC%%include/bash/include/ocache.h
 %%NO_STATIC%%include/bash/include/posixdir.h
 %%NO_STATIC%%include/bash/include/posixjmp.h
 %%NO_STATIC%%include/bash/include/posixstat.h
 %%NO_STATIC%%include/bash/include/posixtime.h
 %%NO_STATIC%%include/bash/include/posixwait.h
 %%NO_STATIC%%include/bash/include/shmbchar.h
 %%NO_STATIC%%include/bash/include/shmbutil.h
 %%NO_STATIC%%include/bash/include/shtty.h
 %%NO_STATIC%%include/bash/include/stat-time.h
 %%NO_STATIC%%include/bash/include/stdc.h
 %%NO_STATIC%%include/bash/include/systimes.h
 %%NO_STATIC%%include/bash/include/typemax.h
 %%NO_STATIC%%include/bash/include/unionwait.h
 %%NO_STATIC%%include/bash/jobs.h
 %%NO_STATIC%%include/bash/make_cmd.h
 %%NO_STATIC%%include/bash/pathnames.h
 %%NO_STATIC%%include/bash/quit.h
 %%NO_STATIC%%include/bash/shell.h
 %%NO_STATIC%%include/bash/sig.h
 %%NO_STATIC%%include/bash/siglist.h
 %%NO_STATIC%%include/bash/signames.h
 %%NO_STATIC%%include/bash/subst.h
 %%NO_STATIC%%include/bash/syntax.h
 %%NO_STATIC%%include/bash/unwind_prot.h
 %%NO_STATIC%%include/bash/variables.h
 %%NO_STATIC%%include/bash/version.h
 %%NO_STATIC%%include/bash/xmalloc.h
 %%NO_STATIC%%include/bash/y.tab.h
 %%NO_STATIC%%lib/bash/Makefile.inc
 %%NO_STATIC%%lib/bash/accept
 %%NO_STATIC%%lib/bash/basename
 %%NO_STATIC%%lib/bash/csv
 %%NO_STATIC%%lib/bash/cut
 %%NO_STATIC%%lib/bash/dirname
 %%NO_STATIC%%lib/bash/fdflags
 %%NO_STATIC%%lib/bash/finfo
 %%NO_STATIC%%lib/bash/head
 %%NO_STATIC%%lib/bash/id
 %%NO_STATIC%%lib/bash/ln
 %%NO_STATIC%%lib/bash/loadables.h
 %%NO_STATIC%%lib/bash/logname
 %%NO_STATIC%%lib/bash/mkdir
 %%NO_STATIC%%lib/bash/mkfifo
 %%NO_STATIC%%lib/bash/mktemp
 %%NO_STATIC%%lib/bash/mypid
 %%NO_STATIC%%lib/bash/pathchk
 %%NO_STATIC%%lib/bash/print
 %%NO_STATIC%%lib/bash/printenv
 %%NO_STATIC%%lib/bash/push
 %%NO_STATIC%%lib/bash/realpath
 %%NO_STATIC%%lib/bash/rm
 %%NO_STATIC%%lib/bash/rmdir
 %%NO_STATIC%%lib/bash/seq
 %%NO_STATIC%%lib/bash/setpgid
 %%NO_STATIC%%lib/bash/sleep
 %%NO_STATIC%%lib/bash/strftime
 %%NO_STATIC%%lib/bash/sync
 %%NO_STATIC%%lib/bash/tee
 %%NO_STATIC%%lib/bash/truefalse
 %%NO_STATIC%%lib/bash/tty
 %%NO_STATIC%%lib/bash/uname
 %%NO_STATIC%%lib/bash/unlink
 %%NO_STATIC%%lib/bash/whoami
 %%NO_STATIC%%libdata/pkgconfig/bash.pc
-man/man1/bash.1.gz
-man/man1/bashbug.1.gz
+share/man/man1/bash.1.gz
+share/man/man1/bashbug.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/da/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/de/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/el/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/et/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/bash.mo