diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index 44f18639981f..89bb46b25ff9 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -1,93 +1,91 @@
 PORTNAME=	spmfilter
 PORTVERSION=	0.6.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.${PORTNAME}.org/files/
 
 MAINTAINER=	ast@treibsand.com
 COMMENT=	High-performance mail filtering framework written in C
 WWW=		https://www.spmfilter.org/
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	libcmime>=0.1.10:mail/libcmime \
 		libesmtp>=1.0:mail/libesmtp
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SMFUSER?=	nobody
 SMFGROUP?=	mail
 SMFDIR?=	/var/spool/spmfilter
 
 USES=		cmake:noninja pkgconfig
 CMAKE_ARGS+=	--no-warn-unused-cli \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=	DB4 DEBUG LDAP MYSQL PGSQL
 OPTIONS_DEFAULT=	DB4
 DB4_DESC=	DB4 backend
 
 # Default requirement for spmfilter rc script
 _REQUIRE=	LOGIN
 
 SUB_FILES=	pkg-deinstall
 
 PLIST_SUB=	LIB_VERSION=${PORTVERSION} \
 		SMFUSER=${SMFUSER} \
 		SMFGROUP=${SMFGROUP} \
 		SMFDIR=${SMFDIR}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDB4}
 USES+=		bdb
 CMAKE_ARGS+=	-DDB4_INCLUDE_DIR="${BDB_INCLUDE_DIR}"
 .else
 CMAKE_ARGS+=	-DWITHOUT_DB4=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_ARGS+=	-DENABLE_DEBUG=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 USES+=	ldap
 .else
 CMAKE_ARGS+=	-DWITHOUT_LDAP=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 LIB_DEPENDS+=	libzdb.so:databases/libzdb
 USES+=		mysql
 _REQUIRE+=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 LIB_DEPENDS+=	libzdb.so:databases/libzdb
 USES+=		pgsql
 _REQUIRE+=	postgresql
 .endif
 
 .if !${PORT_OPTIONS:MMYSQL} && !${PORT_OPTIONS:MPGSQL}
 CMAKE_ARGS+=	-DWITHOUT_ZDB=TRUE
 .endif
 
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share/man|man|' \
-		${WRKSRC}/cmake/Modules/SMFMacros.cmake
 	@${REINPLACE_CMD} -E -e 's|(HAVE_DB4 )db|\1${BDB_LIB_NAME}|' \
 		${WRKSRC}/cmake/Modules/FindDB4.cmake
 	@${REINPLACE_CMD} -E -e 's|\$$\{CMAKE_INSTALL_LIBDIR\}(/pkgconfig)|$${CMAKE_INSTALL_PREFIX}/libdata\1|' \
 		-e 's|(COMMON_LIBS )db|\1${BDB_LIB_NAME}|' \
 		${WRKSRC}/src/CMakeLists.txt
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
 	@${MKDIR} ${STAGEDIR}${SMFDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/spmfilter/pkg-plist b/mail/spmfilter/pkg-plist
index 515c646bfff9..fc09799dea16 100644
--- a/mail/spmfilter/pkg-plist
+++ b/mail/spmfilter/pkg-plist
@@ -1,32 +1,32 @@
 include/spmfilter/smf/smf_core.h
 include/spmfilter/smf/smf_dict.h
 include/spmfilter/smf/smf_email_address.h
 include/spmfilter/smf/smf_envelope.h
 include/spmfilter/smf/smf_header.h
 include/spmfilter/smf/smf_list.h
 include/spmfilter/smf/smf_lookup.h
 include/spmfilter/smf/smf_message.h
 include/spmfilter/smf/smf_modules.h
 include/spmfilter/smf/smf_nexthop.h
 include/spmfilter/smf/smf_part.h
 include/spmfilter/smf/smf_session.h
 include/spmfilter/smf/smf_settings.h
 include/spmfilter/smf/smf_smtp.h
 include/spmfilter/smf/smf_trace.h
 include/spmfilter/spmfilter.h
 include/spmfilter/spmfilter_config.h
 lib/spmfilter/libpipe.so
 lib/spmfilter/libpipe.so.0.6
 lib/spmfilter/libpipe.so.%%LIB_VERSION%%
 lib/spmfilter/libsmf.so
 lib/spmfilter/libsmf.so.0.6
 lib/spmfilter/libsmf.so.%%LIB_VERSION%%
 lib/spmfilter/libsmtpd.so
 lib/spmfilter/libsmtpd.so.0.6
 lib/spmfilter/libsmtpd.so.%%LIB_VERSION%%
 libdata/pkgconfig/spmfilter.pc
 sbin/spmfilter
-man/man1/spmfilter.1.gz
-man/man5/spmfilter.conf.5.gz
+share/man/man1/spmfilter.1.gz
+share/man/man5/spmfilter.conf.5.gz
 @sample etc/spmfilter.conf.sample
 @dir(%%SMFUSER%%,%%SMFGROUP%%,755) %%SMFDIR%%