diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index 6f7e7905997b..ef22a1356216 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	rmilter
 PORTVERSION=	1.10.0
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Milter that performs rspamd, clamav, and other checks
 WWW=		https://github.com/vstakhov/rmilter
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 NOT_FOR_ARCHS=		mips sparc64
 NOT_FOR_ARCHS_REASON=	fails to compile: error: Unsupported word size
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
 
 USES=		compiler:c11 cmake pkgconfig bison ssl gnome
 USE_GNOME=	glib20
 
 USERS=		_rmilter
 GROUPS=		_rmilter
 
 WITH_SENDMAIL_BASE=	yes
 
 OPTIONS_DEFINE=		DKIM
 OPTIONS_DEFAULT=	DKIM
 
 DKIM_DESC=		DKIM signing support
+
 DKIM_LIB_DEPENDS=	libopendkim.so:mail/opendkim
+DKIM_CMAKE_OFF=	-DENABLE_DKIM=OFF
 
 .include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=       -Wno-error=int-conversion
+.endif
+
 # Workaround to prevent bsd.milter.mk from breaking the build with the recent clang
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if ! ${PORT_OPTIONS:MDKIM}
-CMAKE_ARGS+=	-DENABLE_DKIM=OFF
-.endif
-
 post-patch:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/freebsd/rmilter > ${WRKDIR}/rmilter
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/rmilter ${STAGEDIR}${PREFIX}/etc/rc.d/
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/rmilter ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/rmilter.conf.sample ${STAGEDIR}${PREFIX}/etc/
 
 	${INSTALL} -d ${STAGEDIR}/var/run/rmilter
 
 .include <bsd.port.post.mk>