diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile
index 9f9b13226e87..80371b6c93e8 100644
--- a/devel/deforaos-libsystem/Makefile
+++ b/devel/deforaos-libsystem/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	libsystem
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/System/src/libSystem/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	libSystem-${PORTVERSION}
 
 MAINTAINER=	khorben@defora.org
 COMMENT=	DeforaOS core system library
 WWW=		https://www.defora.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig ssl
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 MAKE_ARGS+=	PREFIX=${PREFIX}
-MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 	gtkdoc-check:textproc/gtk-doc
 
 post-patch:
 	${REINPLACE_CMD} 's|/lib/|/libdata/|g' \
 		${WRKSRC}/data/pkgconfig.sh
 	${REINPLACE_CMD} 's|CFLAGS	=|CFLAGS+=|' \
 		${WRKSRC}/src/Makefile
 	${REINPLACE_CMD} 's|CPPFLAGS=|CPPFLAGS+=|' \
 		${WRKSRC}/src/Makefile
 	${REINPLACE_CMD} -e 's|$$(INSTALL)|#$${INSTALL}|' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|$$(MKDIR) $$(DESTDIR)$$(PREFIX)/share/doc/| \
 		#$$(MKDIR) $$(DESTDIR)$$(PREFIX)/share/doc/|' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|./docbook.sh -P "$$(DESTDIR)$$(PREFIX)" -i -- "$$(OBJDIR)configctl.html"| \
 		#./docbook.sh -P "$$(DESTDIR)$$(PREFIX)" -i -- "$$(OBJDIR)configctl.html"|' \
 		${WRKSRC}/doc/Makefile
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|data doc include|data include|' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/configctl \
 		${STAGEDIR}${PREFIX}/lib/libSystem.so.1.0
 
 .include <bsd.port.mk>
diff --git a/devel/deforaos-libsystem/pkg-plist b/devel/deforaos-libsystem/pkg-plist
index 61ba98b091f8..b3d2891fe2ab 100644
--- a/devel/deforaos-libsystem/pkg-plist
+++ b/devel/deforaos-libsystem/pkg-plist
@@ -1,52 +1,52 @@
 bin/configctl
 include/System.h
 include/System/array.h
 include/System/buffer.h
 include/System/config.h
 include/System/error.h
 include/System/event.h
 include/System/file.h
 include/System/hash.h
 include/System/license.h
 include/System/mutator.h
 include/System/object.h
 include/System/parser.h
 include/System/plugin.h
 include/System/string.h
 include/System/token.h
 include/System/userdata.h
 include/System/variable.h
 lib/libSystem.a
 lib/libSystem.so
 lib/libSystem.so.1
 lib/libSystem.so.1.0
 libdata/pkgconfig/libSystem.pc
-%%PORTDOCS%%man/man1/configctl.1.gz
+%%PORTDOCS%%share/man/man1/configctl.1.gz
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-license.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-mutator.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-variable.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/api-index-full.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/ch01.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/deprecated-api-index.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/home.png
 %%PORTDOCS%%share/gtk-doc/html/libSystem/index.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/left-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libSystem/left.png
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-array.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-buffer.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-config.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-error.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-event.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-file.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-hash.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-object.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-parser.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-plugin.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-string.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem-token.html
 %%PORTDOCS%%share/gtk-doc/html/libSystem/libSystem.devhelp2
 %%PORTDOCS%%share/gtk-doc/html/libSystem/right-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libSystem/right.png
 %%PORTDOCS%%share/gtk-doc/html/libSystem/style.css
 %%PORTDOCS%%share/gtk-doc/html/libSystem/up-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/libSystem/up.png