diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index cd4398ab7274..3356cc1b6265 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -21,8 +21,14 @@ NO_WRKSUBDIR=	yes
 MAN3=		dracauth.3
 MAN1=		rpc.dracd.1
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/rpc.dracd.1m
+.if ${OSVERSION} >= 500018
+	@${PERL} -pi -e "s|^RPCGENFLAGS.*|RPCGENFLAGS = -C -b|g" \
+		${WRKSRC}/Makefile
+.endif
 	@${ECHO} "================================================================================"
 	@${ECHO} "Use make -DWITH_POSTFIX or -DWITH_EXIM with this port for databases compatible"
 	@${ECHO} "with those MTAs."
@@ -37,4 +43,4 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/rpc.dracd.1m ${PREFIX}/man/man1/rpc.dracd.1
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/drac/pkg-descr b/mail/drac/pkg-descr
index 0548afa4897a..9145a897684c 100644
--- a/mail/drac/pkg-descr
+++ b/mail/drac/pkg-descr
@@ -9,3 +9,5 @@ this. The POP and SMTP servers can be on a POP server is sufficient to do this.
 The POP and SMTP servers can be on different hosts.
 
 WWW: http://mail.cc.umanitoba.ca/drac/
+
+- Anders Nordby <anders@fix.no>