diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index d59362d1dc63..d2fb96b2c567 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -1,91 +1,93 @@
 PORTNAME=	c-icap
 PORTVERSION=	0.5.11
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.5.x/
 DISTNAME=	c_icap-${PORTVERSION}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	ICAP server implementation
 WWW=		https://c-icap.sourceforge.net/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli \
 		libpcre.so:devel/pcre
 
 USES=		cpe libtool localbase
 CPE_VENDOR=	c-icap_project
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	c-icap
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir="${PREFIX}/etc/c-icap"
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 INSTALL_TARGET=	install-strip
 
 SUB_LIST=	CICAP_USER=${CICAP_USER} \
 		RUN_DIR=${RUN_DIR}
 
 CICAP_USER=	c_icap
 CICAP_UID=	959
 CICAP_GROUP=	c_icap
 CICAP_GID=	959
 LOG_DIR=	/var/log/c-icap
 RUN_DIR=	/var/run/c-icap
 USERS=		${CICAP_USER}
 GROUPS=		${CICAP_GROUP}
 
 PLIST_SUB=	CICAP_GROUP=${CICAP_GROUP} \
 		CICAP_USER=${CICAP_USER} \
 		LOG_DIR=${LOG_DIR} \
 		RUN_DIR=${RUN_DIR}
 
 OPTIONS_DEFINE=		BDB IPV6 LARGE_FILES LDAP MEMCACHE PERL POSIXSEM
 OPTIONS_SUB=		yes
 LARGE_FILES_DESC=	Enable large files support
 MEMCACHE_DESC=		Enable memcached
 POSIXSEM_DESC=		Use POSIX Semaphores instead of SYSV IPC
 
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb=yes
 BDB_CONFIGURE_OFF=	--with-bdb=no
 BDB_CFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LDFLAGS=		-L${BDB_LIB_DIR}
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LARGE_FILES_CONFIGURE_ENABLE=	large-files
 
 LDAP_USES=			ldap
 LDAP_CONFIGURE_ON=		--with-ldap=yes
 LDAP_CONFIGURE_OFF=		--with-ldap=no
 MEMCACHE_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHE_CONFIGURE_WITH=	memcached
 
 PERL_USES=		perl5
 PERL_CONFIGURE_ON=	--with-perl=${PERL}
 PERL_CONFIGURE_OFF=	--without-perl
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|@prefix@/var/log|/var/log/c-icap|g' \
 		-e 's|@prefix@/etc/|@sysconfdir@/|g' \
 		${WRKSRC}/c-icap.conf.in
 	@${REINPLACE_CMD} \
 		-e 's|\.default|.sample|g' \
 		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
 
 post-patch-POSIXSEM-on:
 	@${REINPLACE_CMD} \
 		-e 's|@SYSV_IPC@|0|g' \
 		${WRKSRC}/include/c-icap-conf.h.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/${LOG_DIR} ${STAGEDIR}/${RUN_DIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist
index c688b9dde3b3..42f784e5247f 100644
--- a/www/c-icap/pkg-plist
+++ b/www/c-icap/pkg-plist
@@ -1,64 +1,64 @@
 bin/c-icap
 bin/c-icap-client
 bin/c-icap-config
 bin/c-icap-libicapapi-config
 %%BDB%%bin/c-icap-mkbdb
 bin/c-icap-stretch
 @sample etc/c-icap/c-icap.conf.sample
 @sample etc/c-icap/c-icap.magic.sample
 include/c_icap/access.h
 include/c_icap/acl.h
 include/c_icap/array.h
 include/c_icap/body.h
 include/c_icap/c-icap-conf.h
 include/c_icap/c-icap.h
 include/c_icap/cache.h
 include/c_icap/cfg_param.h
 include/c_icap/ci_regex.h
 include/c_icap/ci_threads.h
 include/c_icap/commands.h
 include/c_icap/debug.h
 include/c_icap/dlib.h
 include/c_icap/filetype.h
 include/c_icap/hash.h
 include/c_icap/header.h
 include/c_icap/log.h
 include/c_icap/lookup_table.h
 include/c_icap/md5.h
 include/c_icap/mem.h
 include/c_icap/module.h
 include/c_icap/net_io.h
 include/c_icap/net_io_ssl.h
 include/c_icap/port.h
 include/c_icap/proc_mutex.h
 include/c_icap/proc_threads_queues.h
 include/c_icap/registry.h
 include/c_icap/request.h
 include/c_icap/service.h
 include/c_icap/shared_mem.h
 include/c_icap/simple_api.h
 include/c_icap/stats.h
 include/c_icap/txtTemplate.h
 include/c_icap/txt_format.h
 include/c_icap/types_ops.h
 include/c_icap/util.h
 %%BDB%%lib/c_icap/bdb_tables.so
 lib/c_icap/dnsbl_tables.so
 %%LDAP%%lib/c_icap/ldap_module.so
 %%MEMCACHE%%lib/c_icap/memcached_cache.so
 %%PERL%%lib/c_icap/perl_handler.so
 lib/c_icap/shared_cache.so
 lib/c_icap/srv_echo.so
 lib/c_icap/srv_ex206.so
 lib/c_icap/sys_logger.so
 lib/libicapapi.so
 lib/libicapapi.so.5
 lib/libicapapi.so.5.0.11
-man/man8/c-icap-client.8.gz
-man/man8/c-icap-config.8.gz
-man/man8/c-icap-libicapapi-config.8.gz
-man/man8/c-icap-mkbdb.8.gz
-man/man8/c-icap-stretch.8.gz
-man/man8/c-icap.8.gz
+share/man/man8/c-icap-client.8.gz
+share/man/man8/c-icap-config.8.gz
+share/man/man8/c-icap-libicapapi-config.8.gz
+share/man/man8/c-icap-mkbdb.8.gz
+share/man/man8/c-icap-stretch.8.gz
+share/man/man8/c-icap.8.gz
 @dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%RUN_DIR%%
 @dir(%%CICAP_USER%%,%%CICAP_GROUP%%,) %%LOG_DIR%%