diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 0256027261d3..9bcc5a62a116 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	cdrdao
 DISTVERSION=	1_2_5
+PORTREVISION=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/rel_${DISTVERSION}/ \
 		SF/${PORTNAME}/rel_${DISTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Record CD-R[W]s in disk-at-once mode
 WWW=		https://cdrdao.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		alias autoreconf compiler:c++11-lang gmake iconv localbase tar:bzip2
 USE_CXXSTD=	c++11
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-gcdmaster=no \
 		--without-pcctsbin \
 		--without-pcctsinc \
 		--with-posix-threads=no \
 		--with-scglib
 
 OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
 OPTIONS_DEFAULT=	MP3OGG
 OPTIONS_SUB=		yes
 
 MP3OGG_DESC=		Build with MP3/Ogg support (for sysutils/gcdmaster)
 MP3OGG_LIB_DEPENDS=	libao.so:audio/libao \
 			libmad.so:audio/libmad \
 			libvorbis.so:audio/libvorbis
 MP3OGG_USES=		pkgconfig
 MP3OGG_CONFIGURE_OFF=	--with-mp3-support=no --with-ogg-support=no
 
 TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
 TOC2MP3_LIB_DEPENDS=	libmp3lame.so:audio/lame
 TOC2MP3_CONFIGURE_OFF=	--with-lame=no
 
 post-patch:
 .for i in cdrdao.man main.cc
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
 .endfor
 .for i in toc2cddb.1 toc2cue.1
 	@${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in CREDITS ChangeLog README README.PlexDAE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index be2ca724326c..6c53eb53a731 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -1,15 +1,15 @@
 bin/cdrdao
 bin/cue2toc
 bin/toc2cddb
 bin/toc2cue
 %%TOC2MP3%%bin/toc2mp3
 @postunexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
-man/man1/cdrdao.1.gz
-man/man1/cue2toc.1.gz
-man/man1/toc2cddb.1.gz
-man/man1/toc2cue.1.gz
+share/man/man1/cdrdao.1.gz
+share/man/man1/cue2toc.1.gz
+share/man/man1/toc2cddb.1.gz
+share/man/man1/toc2cue.1.gz
 %%DATADIR%%/drivers
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.PlexDAE