diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 7271243d25d5..849eaf7f1138 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -26,7 +26,7 @@ CONFLICTS=	bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.*
 
 OPTIONS_DEFAULT=	IPV6 SSL LINKS XML THREADS
 OPTIONS_DEFINE=		SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \
-			FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RRL \
+			FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH \
 			SIGCHASE IPV6 THREADS
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
@@ -41,7 +41,7 @@ SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
-RRL_DESC=		Enable Response Rate Limiting (experimental)
+RPZRRL_PATCH_DESC=	RPZ speed improvements and RRL patch (experimental)
 DLZ_DESC=		Dynamically Loadable Zones
 DLZ_POSTGRESQL_DESC=	DLZ Postgres driver
 DLZ_MYSQL_DESC=		DLZ MySQL driver (no threading)
@@ -108,9 +108,9 @@ CONFIGURE_ARGS+=	--enable-rpz-nsip
 CONFIGURE_ARGS+=	--enable-rpz-nsdname
 .endif
 
-.if ${PORT_OPTIONS:MRRL}
-PATCHFILES=		rl-9.8.4-P1.patch
-PATCH_SITES=		http://ss.vix.com/~vixie/
+.if ${PORT_OPTIONS:MRPZRRL_PATCH}
+PATCHFILES=		rpz+rl-9.8.4-P1.patch
+PATCH_SITES=		http://ss.vix.com/~vjs/
 .endif
 
 .if ${PORT_OPTIONS:MDLZ_POSTGRESQL}
diff --git a/dns/bind98/distinfo b/dns/bind98/distinfo
index 24559b1105c7..89d2aa5f42ce 100644
--- a/dns/bind98/distinfo
+++ b/dns/bind98/distinfo
@@ -1,4 +1,4 @@
 SHA256 (bind-9.8.4-P1.tar.gz) = 60c979575bf6288570cb4e3e9ab9d99bb93a55d2a4946ce277f6e6e642dda21f
 SIZE (bind-9.8.4-P1.tar.gz) = 7129321
-SHA256 (rl-9.8.4-P1.patch) = d67a75465ff7196c05e1ab0c426f7f714ff9dc56931fdf48b484aed1e08c6740
-SIZE (rl-9.8.4-P1.patch) = 95560
+SHA256 (rpz+rl-9.8.4-P1.patch) = d76eebb9d428bed488f28ad492ef19c9056e151b619ab55ea323cc03860d37b6
+SIZE (rpz+rl-9.8.4-P1.patch) = 172254
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index a5773d1d5649..1feb0e8a2b0c 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
 
 OPTIONS_DEFAULT=	IPV6 SSL LINKS XML THREADS
 OPTIONS_DEFINE=		SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \
-			FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RRL \
+			FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH \
 			SIGCHASE IPV6 THREADS
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
@@ -42,7 +42,7 @@ SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
-RRL_DESC=		Enable Response Rate Limiting (experimental)
+RPZRRL_PATCH_DESC=	RPZ speed improvements and RRL patch (experimental)
 DLZ_DESC=		Dynamically Loadable Zones
 DLZ_POSTGRESQL_DESC=	DLZ Postgres driver
 DLZ_MYSQL_DESC=		DLZ MySQL driver (no threading)
@@ -114,9 +114,9 @@ CONFIGURE_ARGS+=	--enable-rpz-nsip
 CONFIGURE_ARGS+=	--enable-rpz-nsdname
 .endif
 
-.if ${PORT_OPTIONS:MRRL}
-PATCHFILES=		rl-9.9.2-P1.patch
-PATCH_SITES=		http://ss.vix.com/~vixie/
+.if ${PORT_OPTIONS:MRPZRRL_PATCH}
+PATCHFILES=		rpz+rl-9.9.2-P1.patch
+PATCH_SITES=		http://ss.vix.com/~vjs/
 .endif
 
 .if ${PORT_OPTIONS:MDLZ_MYSQL}
diff --git a/dns/bind99/distinfo b/dns/bind99/distinfo
index a3859aed0fd9..e197448478a7 100644
--- a/dns/bind99/distinfo
+++ b/dns/bind99/distinfo
@@ -1,4 +1,4 @@
 SHA256 (bind-9.9.2-P1.tar.gz) = 4bce7c020402623333b655be5167ae8c52f30a6bfe9750caa3ab70da7d90219c
 SIZE (bind-9.9.2-P1.tar.gz) = 7277498
-SHA256 (rl-9.9.2-P1.patch) = 79a6f6298fe8a69bc4b981041122152a0a7aa12781e438cc7ec2b421338d02d0
-SIZE (rl-9.9.2-P1.patch) = 95625
+SHA256 (rpz+rl-9.9.2-P1.patch) = 4057f499980d587f498065c00e5e60802f3bd9ea87d8ba82dba44780b784740d
+SIZE (rpz+rl-9.9.2-P1.patch) = 173437