diff --git a/CHANGES b/CHANGES
index 586d58b7bc..18820e0b47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6083.	[bug]		Fix DNSRPS-enabled builds as they were inadvertently
+			broken by changes 5949 and 6042. [GL #3827]
+
 6082.	[test]		fuzz/dns_message_checksig leaked memory when shutting
 			down. [GL #3828]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 3bffb2d061..b57976ff31 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9720,7 +9720,7 @@ load_configuration(const char *filename, named_server_t *server,
 	 * Start and connect to the DNS Response Policy Service
 	 * daemon, dnsrpzd, for each view that uses DNSRPS.
 	 */
-	for (view = ISC_LIST_HEAD(server->viewlist); view != NULL;
+	for (dns_view_t *view = ISC_LIST_HEAD(server->viewlist); view != NULL;
 	     view = ISC_LIST_NEXT(view, link))
 	{
 		result = dns_dnsrps_connect(view->rpzs);
diff --git a/configure.ac b/configure.ac
index dcfe65377e..be818d58be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1497,10 +1497,7 @@ AC_COMPILE_IFELSE(
     AC_MSG_RESULT([no])
   ])
 
-# DNSRPS is not included in pairwise testing as the librpz library is not
-# present in the relevant Docker image.
-#
-# [pairwise: skip]
+# [pairwise: --enable-dnsrps --enable-dnsrps-dl, --disable-dnsrps]
 AC_ARG_ENABLE([dnsrps-dl],
 	      [AS_HELP_STRING([--enable-dnsrps-dl],
 			      [DNS Response Policy Service delayed link
diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c
index 94f5d1c490..a78c8f2013 100644
--- a/lib/dns/dnsrps.c
+++ b/lib/dns/dnsrps.c
@@ -624,7 +624,8 @@ rpsdb_finddb(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
 
 static isc_result_t
 rpsdb_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
-		   isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) {
+		   unsigned int options, isc_stdtime_t now,
+		   dns_rdatasetiter_t **iteratorp) {
 	rpsdb_t *rpsdb = (rpsdb_t *)db;
 	rpsdb_rdatasetiter_t *rpsdb_iter;
 
@@ -640,6 +641,7 @@ rpsdb_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 		.common= {.magic = DNS_RDATASETITER_MAGIC,
 			.methods = &rpsdb_rdatasetiter_methods,
 			.db = db,
+			.options = options,
 		},
 	};