diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index f1b64ebf9296..dc4e660fd7ca 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	tntnet
 PORTVERSION=	2.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Webapplicationserver for C++
 WWW=		https://www.tntnet.org/index.html
 
 BUILD_DEPENDS=	zip:archivers/zip
 LIB_DEPENDS=	libcxxtools.so:devel/cxxtools
 
 USES=		cpe iconv libtool localbase:ldflags pathfix pkgconfig \
 		shebangfix
 USE_CXXSTD=	c++14
 
 SHEBANG_FILES=	tntnet-conf2xml.pl
 #USE_CSTD=	gnu89
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var
 
 PATCH_STRIP=	-p1
 
 .if defined(WITH_GNUTLS)
 CONFIGURE_ARGS+=	--with-ssl=gnutls
 LIB_DEPENDS+=	libgnutls.so:security/gnutls
 .else
 CONFIGURE_ARGS+=	--with-ssl=openssl
 USES+=	ssl
 .endif
 
 USERS=		www
 GROUPS=		www
 
 post-configure:
 	${REINPLACE_CMD} 's/^\(#define[[:space:]]*HAVE_SENDFILE[[:space:]]*\).*/\1\0/' ${WRKSRC}/framework/common/config.h
 
 .include <bsd.port.mk>
diff --git a/www/tntnet/pkg-plist b/www/tntnet/pkg-plist
index 636ea93d8cee..fbd3196c324c 100644
--- a/www/tntnet/pkg-plist
+++ b/www/tntnet/pkg-plist
@@ -1,137 +1,137 @@
 bin/ecppc
 bin/ecppl
 bin/ecppll
 bin/tntnet
 bin/tntnet-config
 %%ETCDIR%%/tntnet
 @sample %%ETCDIR%%/tntnet.xml.sample
 include/tnt/applicationunlocker.h
 include/tnt/backgroundworker.h
 include/tnt/cmd.h
 include/tnt/compident.h
 include/tnt/comploader.h
 include/tnt/component.h
 include/tnt/componentfactory.h
 include/tnt/configurator.h
 include/tnt/contentdisposition.h
 include/tnt/contenttype.h
 include/tnt/convert.h
 include/tnt/cookie.h
 include/tnt/data.h
 include/tnt/deflatestream.h
 include/tnt/dispatcher.h
 include/tnt/ecpp.h
 include/tnt/encoding.h
 include/tnt/htmlescostream.h
 include/tnt/http.h
 include/tnt/httperror.h
 include/tnt/httpheader.h
 include/tnt/httpmessage.h
 include/tnt/httpparser.h
 include/tnt/httpreply.h
 include/tnt/httprequest.h
 include/tnt/job.h
 include/tnt/langlib.h
 include/tnt/maptarget.h
 include/tnt/mbcomponent.h
 include/tnt/messageattribute.h
 include/tnt/messageheader.h
 include/tnt/messageheaderparser.h
 include/tnt/mimedb.h
 include/tnt/multipart.h
 include/tnt/object.h
 include/tnt/parser.h
 include/tnt/poller.h
 include/tnt/process.h
 include/tnt/query_params.h
 include/tnt/savepoint.h
 include/tnt/scope.h
 include/tnt/scopemanager.h
 include/tnt/sessionscope.h
 include/tnt/sessionunlocker.h
 include/tnt/socketif.h
 include/tnt/stringlessignorecase.h
 include/tnt/threadcontext.h
 include/tnt/tntconfig.h
 include/tnt/tntnet.h
 include/tnt/unzipfile.h
 include/tnt/urlescostream.h
 include/tnt/urlmapper.h
 include/tnt/worker.h
 include/tnt/zdata.h
 lib/libtntnet.so
 lib/libtntnet.so.12
 lib/libtntnet.so.12.0.0
 lib/libtntnet_sdk.so
 lib/libtntnet_sdk.so.12
 lib/libtntnet_sdk.so.12.0.0
 lib/tntnet/alldemos.so
 lib/tntnet/alldemos.so.0
 lib/tntnet/alldemos.so.0.0.0
 lib/tntnet/backgroundjob.so
 lib/tntnet/backgroundjob.so.0
 lib/tntnet/backgroundjob.so.0.0.0
 lib/tntnet/calc.so
 lib/tntnet/calc.so.0
 lib/tntnet/calc.so.0.0.0
 lib/tntnet/calcajax.so
 lib/tntnet/calcajax.so.0
 lib/tntnet/calcajax.so.0.0.0
 lib/tntnet/calci18n.so
 lib/tntnet/calci18n.so.0
 lib/tntnet/calci18n.so.0.0.0
 lib/tntnet/calcmvc.so
 lib/tntnet/calcmvc.so.0
 lib/tntnet/calcmvc.so.0.0.0
 lib/tntnet/chat.so
 lib/tntnet/chat.so.0
 lib/tntnet/chat.so.0.0.0
 lib/tntnet/comp.so
 lib/tntnet/comp.so.0
 lib/tntnet/comp.so.0.0.0
 lib/tntnet/config.so
 lib/tntnet/config.so.0
 lib/tntnet/config.so.0.0.0
 lib/tntnet/controls.so
 lib/tntnet/controls.so.0
 lib/tntnet/controls.so.0.0.0
 lib/tntnet/cookie.so
 lib/tntnet/cookie.so.0
 lib/tntnet/cookie.so.0.0.0
 lib/tntnet/extlib.a
 lib/tntnet/extlib.so
 lib/tntnet/extlib.so.0
 lib/tntnet/extlib.so.0.0.0
 lib/tntnet/hello.so
 lib/tntnet/hello.so.0
 lib/tntnet/hello.so.0.0.0
 lib/tntnet/message.so
 lib/tntnet/message.so.0
 lib/tntnet/message.so.0.0.0
 lib/tntnet/savepoint.so
 lib/tntnet/savepoint.so.0
 lib/tntnet/savepoint.so.0.0.0
 lib/tntnet/session.so
 lib/tntnet/session.so.0
 lib/tntnet/session.so.0.0.0
 lib/tntnet/sprintf.so
 lib/tntnet/sprintf.so.0
 lib/tntnet/sprintf.so.0.0.0
 lib/tntnet/strings.so
 lib/tntnet/strings.so.0
 lib/tntnet/strings.so.0.0.0
 lib/tntnet/tntnet.so
 lib/tntnet/tntnet.so.12
 lib/tntnet/tntnet.so.12.0.0
 lib/tntnet/upload.so
 lib/tntnet/upload.so.0
 lib/tntnet/upload.so.0.0.0
-man/man1/ecppc.1.gz
-man/man1/ecppl.1.gz
-man/man1/ecppll.1.gz
-man/man1/tntnet-config.1.gz
-man/man7/ecpp.7.gz
-man/man7/tntnet.properties.7.gz
-man/man7/tntnet.xml.7.gz
-man/man8/tntnet.8.gz
+share/man/man1/ecppc.1.gz
+share/man/man1/ecppl.1.gz
+share/man/man1/ecppll.1.gz
+share/man/man1/tntnet-config.1.gz
+share/man/man7/ecpp.7.gz
+share/man/man7/tntnet.properties.7.gz
+share/man/man7/tntnet.xml.7.gz
+share/man/man8/tntnet.8.gz
 %%DATADIR%%/tntnet-conf2xml.pl