diff --git a/sysutils/lizardfs/Makefile b/sysutils/lizardfs/Makefile
index bb2e9ebc14431..7feaf1fd14082 100644
--- a/sysutils/lizardfs/Makefile
+++ b/sysutils/lizardfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lizardfs
 PORTVERSION=	3.12.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
@@ -37,7 +37,7 @@ USE_LDCONFIG=	yes
 CFLAGS+=	-DSPDLOG_FMT_EXTERNAL=1
 LDFLAGS+=	-L${LOCALBASE}/lib -lfmt
 CMAKE_BUILD_TYPE=	Release
-CMAKE_ARGS=	-DMAN_SUBDIR=man \
+CMAKE_ARGS=	\
 	-DENABLE_WERROR=OFF \
 	-DENABLE_LIGHTMFS=ON \
 	-DENABLE_DEBIAN_PATHS=OFF \
diff --git a/sysutils/lizardfs/files/patch-CMakeLists.txt b/sysutils/lizardfs/files/patch-CMakeLists.txt
index 229c0beb4d4cc..fd2d4079393b7 100644
--- a/sysutils/lizardfs/files/patch-CMakeLists.txt
+++ b/sysutils/lizardfs/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig	2017-12-20 09:59:37 UTC
 +++ CMakeLists.txt
-@@ -167,13 +167,7 @@ if(ENABLE_TESTS AND NOT THROW_INSTEAD_OF_ABORT)
+@@ -167,13 +167,7 @@ endif()
    message(STATUS "THROW_INSTEAD_OF_ABORT: ${THROW_INSTEAD_OF_ABORT}")
  endif()
  
@@ -15,20 +15,18 @@
  
  if(ENABLE_DEBIAN_PATHS)
    if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/")
-@@ -193,9 +187,9 @@ else()
+@@ -193,8 +187,8 @@ else()
    set(SBIN_SUBDIR  "sbin")
    set(LIB_SUBDIR   "lib${LIBSUFFIX}")
    set(ETC_SUBDIR   "etc/mfs")
 -  set(RUN_SUBDIR   "var/run/mfs")
 -  set(DATA_SUBDIR  "var/lib/mfs")
--  set(MAN_SUBDIR   "share/man")
 +  set(RUN_SUBDIR   "/var/run/mfs")
 +  set(DATA_SUBDIR  "/var/mfs")
-+  set(MAN_SUBDIR   "man")
+   set(MAN_SUBDIR   "share/man")
    set(CGI_SUBDIR   "share/mfscgi")
    set(INCL_SUBDIR  "include/lizardfs")
- endif()
-@@ -205,8 +199,6 @@ set(BIN_PATH   ${INSTALL_PREFIX_NO_SLASH}/${BIN_SUBDIR
+@@ -205,8 +199,6 @@ set(ETC_PATH   ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR
  set(SBIN_PATH  ${INSTALL_PREFIX_NO_SLASH}/${SBIN_SUBDIR})
  set(LIB_PATH   ${INSTALL_PREFIX_NO_SLASH}/${LIB_SUBDIR})
  set(ETC_PATH   ${INSTALL_PREFIX_NO_SLASH}/${ETC_SUBDIR})
diff --git a/sysutils/lizardfs/pkg-plist b/sysutils/lizardfs/pkg-plist
index 7942a84732dc9..d9d585a1e3cdf 100644
--- a/sysutils/lizardfs/pkg-plist
+++ b/sysutils/lizardfs/pkg-plist
@@ -55,51 +55,6 @@ lib/liblizardfs-client_pic.a
 lib/liblizardfsmount_shared.so
 lib/libredirect_bind.so
 lib/libslow_chunk_scan.so
-man/man1/lizardfs-appendchunks.1.gz
-man/man1/lizardfs-checkfile.1.gz
-man/man1/lizardfs-deleattr.1.gz
-man/man1/lizardfs-dirinfo.1.gz
-man/man1/lizardfs-fileinfo.1.gz
-man/man1/lizardfs-filerepair.1.gz
-man/man1/lizardfs-geteattr.1.gz
-man/man1/lizardfs-getgoal.1.gz
-man/man1/lizardfs-gettrashtime.1.gz
-man/man1/lizardfs-makesnapshot.1.gz
-man/man1/lizardfs-repquota.1.gz
-man/man1/lizardfs-rgetgoal.1.gz
-man/man1/lizardfs-rgettrashtime.1.gz
-man/man1/lizardfs-rremove.1.gz
-man/man1/lizardfs-rsetgoal.1.gz
-man/man1/lizardfs-rsettrashtime.1.gz
-man/man1/lizardfs-seteattr.1.gz
-man/man1/lizardfs-setgoal.1.gz
-man/man1/lizardfs-setquota.1.gz
-man/man1/lizardfs-settrashtime.1.gz
-man/man1/lizardfs.1.gz
-man/man1/mfsmount.1.gz
-man/man5/globaliolimits.cfg.5.gz
-man/man5/iolimits.cfg.5.gz
-man/man5/mfschunkserver.cfg.5.gz
-man/man5/mfsexports.cfg.5.gz
-man/man5/mfsgoals.cfg.5.gz
-man/man5/mfshdd.cfg.5.gz
-man/man5/mfsmaster.cfg.5.gz
-man/man5/mfsmetalogger.cfg.5.gz
-man/man5/mfsmount.cfg.5.gz
-man/man5/mfstopology.cfg.5.gz
-man/man7/lizardfs.7.gz
-man/man7/mfs.7.gz
-man/man7/moosefs.7.gz
-man/man8/lizardfs-admin.8.gz
-man/man8/lizardfs-cgiserver.8.gz
-man/man8/lizardfs-probe.8.gz
-man/man8/mfscgiserv.8.gz
-man/man8/mfschunkserver.8.gz
-man/man8/mfsmaster.8.gz
-man/man8/mfsmetadump.8.gz
-man/man8/mfsmetalogger.8.gz
-man/man8/mfsmetarestore.8.gz
-man/man8/mfsrestoremaster.8.gz
 sbin/lizardfs-cgiserver
 sbin/mfscgiserv
 sbin/mfschunkserver
@@ -108,6 +63,51 @@ sbin/mfsmetadump
 sbin/mfsmetalogger
 sbin/mfsmetarestore
 sbin/mfsrestoremaster
+share/man/man1/lizardfs-appendchunks.1.gz
+share/man/man1/lizardfs-checkfile.1.gz
+share/man/man1/lizardfs-deleattr.1.gz
+share/man/man1/lizardfs-dirinfo.1.gz
+share/man/man1/lizardfs-fileinfo.1.gz
+share/man/man1/lizardfs-filerepair.1.gz
+share/man/man1/lizardfs-geteattr.1.gz
+share/man/man1/lizardfs-getgoal.1.gz
+share/man/man1/lizardfs-gettrashtime.1.gz
+share/man/man1/lizardfs-makesnapshot.1.gz
+share/man/man1/lizardfs-repquota.1.gz
+share/man/man1/lizardfs-rgetgoal.1.gz
+share/man/man1/lizardfs-rgettrashtime.1.gz
+share/man/man1/lizardfs-rremove.1.gz
+share/man/man1/lizardfs-rsetgoal.1.gz
+share/man/man1/lizardfs-rsettrashtime.1.gz
+share/man/man1/lizardfs-seteattr.1.gz
+share/man/man1/lizardfs-setgoal.1.gz
+share/man/man1/lizardfs-setquota.1.gz
+share/man/man1/lizardfs-settrashtime.1.gz
+share/man/man1/lizardfs.1.gz
+share/man/man1/mfsmount.1.gz
+share/man/man5/globaliolimits.cfg.5.gz
+share/man/man5/iolimits.cfg.5.gz
+share/man/man5/mfschunkserver.cfg.5.gz
+share/man/man5/mfsexports.cfg.5.gz
+share/man/man5/mfsgoals.cfg.5.gz
+share/man/man5/mfshdd.cfg.5.gz
+share/man/man5/mfsmaster.cfg.5.gz
+share/man/man5/mfsmetalogger.cfg.5.gz
+share/man/man5/mfsmount.cfg.5.gz
+share/man/man5/mfstopology.cfg.5.gz
+share/man/man7/lizardfs.7.gz
+share/man/man7/mfs.7.gz
+share/man/man7/moosefs.7.gz
+share/man/man8/lizardfs-admin.8.gz
+share/man/man8/lizardfs-cgiserver.8.gz
+share/man/man8/lizardfs-probe.8.gz
+share/man/man8/mfscgiserv.8.gz
+share/man/man8/mfschunkserver.8.gz
+share/man/man8/mfsmaster.8.gz
+share/man/man8/mfsmetadump.8.gz
+share/man/man8/mfsmetalogger.8.gz
+share/man/man8/mfsmetarestore.8.gz
+share/man/man8/mfsrestoremaster.8.gz
 share/mfscgi/chart.cgi
 share/mfscgi/err.gif
 share/mfscgi/favicon.ico