diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index 4219a694e1bf..55165be1855e 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	cdrkit
 PORTVERSION=	1.1.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ponce.cc/slackware/sources/repo/ \
 		http://vault.101011010.xyz/distfiles/ \
 		http://freebsd.nsu.ru/distfiles/
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT?=	Command-line CD/DVD writing suite
 WWW=		http://www.cdrkit.org/
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS?=	${PORTNAME}-genisoimage>0:sysutils/genisoimage
 
 USES=		cmake iconv perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	3rd-party/dirsplit/dirsplit
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
+CMAKE_ARGS=	-DMANSUBDIR:PATH=share/man
+
 CONFLICTS?=	cdrtools
 
 PLIST_SUB?=	CDRKIT="" GENISOIMAGE="@comment "
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake \
-	    ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|fexecve|librols_fexecve|g' \
 	    ${WRKSRC}/librols/fexec.c \
 	    ${WRKSRC}/include/schily.h
 	@${REINPLACE_CMD} -e 's|getdelim|wodim_getdelim|g' ${WRKSRC}/wodim/cue.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/cdrkit/pkg-plist b/sysutils/cdrkit/pkg-plist
index e7bcb46c85d1..9d73d7c33bc2 100644
--- a/sysutils/cdrkit/pkg-plist
+++ b/sysutils/cdrkit/pkg-plist
@@ -1,30 +1,30 @@
 %%GENISOIMAGE%%bin/genisoimage
 %%CDRKIT%%bin/devdump
 %%CDRKIT%%bin/isodebug
 %%CDRKIT%%bin/isodump
 %%CDRKIT%%bin/isoinfo
 %%CDRKIT%%bin/isovfy
 %%CDRKIT%%bin/wodim
 %%CDRKIT%%bin/icedax
 %%CDRKIT%%bin/pitchplay
 %%CDRKIT%%bin/readmult
 %%CDRKIT%%bin/cdda2mp3
 %%CDRKIT%%bin/cdda2ogg
 %%CDRKIT%%bin/readom
 %%CDRKIT%%bin/dirsplit
 %%CDRKIT%%sbin/netscsid
-%%CDRKIT%%man/man1/cdda2ogg.1.gz
-%%CDRKIT%%man/man1/devdump.1.gz
-%%CDRKIT%%man/man1/dirsplit.1.gz
-%%GENISOIMAGE%%man/man1/genisoimage.1.gz
-%%CDRKIT%%man/man1/icedax.1.gz
-%%CDRKIT%%man/man1/isodebug.1.gz
-%%CDRKIT%%man/man1/isodump.1.gz
-%%CDRKIT%%man/man1/isoinfo.1.gz
-%%CDRKIT%%man/man1/isovfy.1.gz
-%%CDRKIT%%man/man1/list_audio_tracks.1.gz
-%%CDRKIT%%man/man1/pitchplay.1.gz
-%%CDRKIT%%man/man1/readmult.1.gz
-%%CDRKIT%%man/man1/readom.1.gz
-%%CDRKIT%%man/man1/wodim.1.gz
-%%GENISOIMAGE%%man/man5/genisoimagerc.5.gz
+%%CDRKIT%%share/man/man1/cdda2ogg.1.gz
+%%CDRKIT%%share/man/man1/devdump.1.gz
+%%CDRKIT%%share/man/man1/dirsplit.1.gz
+%%GENISOIMAGE%%share/man/man1/genisoimage.1.gz
+%%CDRKIT%%share/man/man1/icedax.1.gz
+%%CDRKIT%%share/man/man1/isodebug.1.gz
+%%CDRKIT%%share/man/man1/isodump.1.gz
+%%CDRKIT%%share/man/man1/isoinfo.1.gz
+%%CDRKIT%%share/man/man1/isovfy.1.gz
+%%CDRKIT%%share/man/man1/list_audio_tracks.1.gz
+%%CDRKIT%%share/man/man1/pitchplay.1.gz
+%%CDRKIT%%share/man/man1/readmult.1.gz
+%%CDRKIT%%share/man/man1/readom.1.gz
+%%CDRKIT%%share/man/man1/wodim.1.gz
+%%GENISOIMAGE%%share/man/man5/genisoimagerc.5.gz