diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index 966006089370..95a46cbc49b2 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	policyd2
-PORTVERSION=	2.0.10
-PORTREVISION=	1
+PORTVERSION=	2.0.11
 CATEGORIES=	mail
-MASTER_SITES=	SF/policyd/2.0.x%20%28Stable%29/v${PORTVERSION}
+MASTER_SITES=	http://devlabs.linuxassist.net/attachments/download/187/
 DISTNAME=	cluebringer-${PORTVERSION}
 
 MAINTAINER=	chifeng@gmail.com
@@ -24,10 +23,10 @@ USE_PERL5=	yes
 USE_PHP=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	policyd2.sh
-SUB_FILES=	pkg-message
+BINMODE=	0755
 
 WEBUIDIR=	${PREFIX}/www/policyd
-PORTDOCS=	AUTHORS CHANGELOG INSTALL TODO WISHLIST
+PORTDOCS=	AUTHORS ChangeLog INSTALL TODO WISHLIST
 PORTDATA=	*
 
 OPTIONS=	MYSQL "Use MySQL support" On \
@@ -47,21 +46,20 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/cbpadmin
-	@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/cbpolicyd
+	@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/cbpadmin \
+		${WRKSRC}/cbpolicyd
 
 do-install:
-	@${INSTALL} -d ${WEBUIDIR}
-	@cd ${WRKSRC} && ${CP} -Rpf webui/ ${WEBUIDIR}
-	@cd ${WRKSRC} && ${CP} -Rpf cbp ${SITE_PERL}
-	${INSTALL_SCRIPT} -m 0755 ${WRKSRC}/cbpadmin ${PREFIX}/bin
-	${INSTALL_SCRIPT} -m 0755 ${WRKSRC}/cbpolicyd ${PREFIX}/bin
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/cluebringer.conf ${PREFIX}/etc/cluebringer.conf.sample
+	@${INSTALL} -d ${WEBUIDIR} ${SITE_PERL}/cbp
+	@cd ${WRKSRC}/webui && ${COPYTREE_SHARE} \* ${WEBUIDIR}
+	@cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} \* ${SITE_PERL}/cbp
+	${INSTALL_SCRIPT} ${WRKSRC}/cbpadmin ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/cbpolicyd ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/cluebringer.conf ${PREFIX}/etc/cluebringer.conf.sample
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/cluebringer.conf ]; then \
-		${CP} -p ${PREFIX}/etc/cluebringer.conf.sample ${PREFIX}/etc/cluebringer.conf ; \
-		${CHMOD} +w ${PREFIX}/etc/cluebringer.conf ; \
+		${INSTALL_DATA} -m 666 ${PREFIX}/etc/cluebringer.conf.sample ${PREFIX}/etc/cluebringer.conf ;\
 	fi
 
 .if !defined(NOPORTDATA)
@@ -75,4 +73,8 @@ post-install:
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Please check INSTALL file to configure!"
+	@${ECHO_MSG}
+
 .include <bsd.port.post.mk>
diff --git a/mail/policyd2/distinfo b/mail/policyd2/distinfo
index 29f3cdbb4455..191b8a14e6ae 100644
--- a/mail/policyd2/distinfo
+++ b/mail/policyd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cluebringer-2.0.10.tar.gz) = be335acb8e282a31a65a3f44de8c0ac0f0ac8f18090e20391b486d6b1efd752b
-SIZE (cluebringer-2.0.10.tar.gz) = 133110
+SHA256 (cluebringer-2.0.11.tar.gz) = 7095454c4d62335b9b4c297d51d058877d3a44e697d5d8de8968dd21898d464c
+SIZE (cluebringer-2.0.11.tar.gz) = 139075
diff --git a/mail/policyd2/files/pkg-message.in b/mail/policyd2/files/pkg-message.in
deleted file mode 100644
index 9387aa755ab4..000000000000
--- a/mail/policyd2/files/pkg-message.in
+++ /dev/null
@@ -1,2 +0,0 @@
-Please check INSTALL file to configure!
-
diff --git a/mail/policyd2/files/policyd2.sh.in b/mail/policyd2/files/policyd2.sh.in
index a5443c618452..ef4359f9ecc2 100644
--- a/mail/policyd2/files/policyd2.sh.in
+++ b/mail/policyd2/files/policyd2.sh.in
@@ -19,7 +19,7 @@ name="policyd2"
 rcvar=policyd2_enable
 
 command="%%LOCALBASE%%/bin/cbpolicyd"
-command_interpreter="/usr/bin/perl"
+command_interpreter="%%LOCALBASE%%/bin/perl"
 
 load_rc_config $name