diff --git a/CHANGES b/CHANGES
index c0a7fe310a..cd7a79f57a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4656.	[bug]		Apply "port" and "dscp" values specified in catalog
+			zone's "default-masters" option to the generated
+			configuration of its member zones. [RT #45545]
+
 4655.	[bug]		Lack of seccomp could be falsely reported. [RT #45599]
 
 4654.	[cleanup]	Don't use C++ keywords delete, new and namespace.
diff --git a/bin/tests/system/catz/ns1/named.conf b/bin/tests/system/catz/ns1/named.conf
index 17bb08cd3d..32274d67fe 100644
--- a/bin/tests/system/catz/ns1/named.conf
+++ b/bin/tests/system/catz/ns1/named.conf
@@ -20,6 +20,7 @@ options {
 	allow-new-zones yes;
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
+	listen-on port 5301 { 10.53.0.1; };
 	listen-on-v6 { none; };
 	notify no;
 	recursion no;
diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in
index dd418af28c..f8e87068f4 100644
--- a/bin/tests/system/catz/ns2/named.conf.in
+++ b/bin/tests/system/catz/ns2/named.conf.in
@@ -29,7 +29,7 @@ options {
 			in-memory no
 			zone-directory "zonedir";
 		zone "catalog2.example"
-			default-masters { 10.53.0.1; }
+			default-masters { 10.53.0.1 port 5301; }
 			in-memory yes;
 		zone "catalog3.example"
 			default-masters { 10.53.0.1; }
diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index 8dead2d1e8..11b1fc8c62 100644
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -214,7 +214,7 @@ if [ $ret = 0 ]; then
 	while test $try -lt 45
 	do
 	    sleep 1
-	    sed -n "$cur,"'$p' < ns2/named.run | grep "transfer of 'dom4.example/IN' from 10.53.0.1#5300: Transfer status: success" > /dev/null && {
+	    sed -n "$cur,"'$p' < ns2/named.run | grep "transfer of 'dom4.example/IN' from 10.53.0.1#5301: Transfer status: success" > /dev/null && {
 		ret=0
 		break
 	    }
diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index c6a78ae986..f05cb876ee 100644
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1505,7 +1505,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 	 * We have to generate a text buffer with regular zone config:
 	 * zone foo.bar {
 	 * 	type slave;
-	 * 	masters { ip1 port1; ip2 port2; };
+	 * 	masters [ dscp X ] { ip1 port port1; ip2 port port2; };
 	 * }
 	 */
 	isc_buffer_t *buffer = NULL;
@@ -1513,6 +1513,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 	isc_result_t result;
 	isc_uint32_t i;
 	isc_netaddr_t netaddr;
+	char pbuf[sizeof("65535")]; /* used both for port number and DSCP */
 
 	REQUIRE(zone != NULL);
 	REQUIRE(entry != NULL);
@@ -1520,7 +1521,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 
 	/*
 	 * The buffer will be reallocated if something won't fit,
-	 * ISC_BUFFER_INC seems like a good start.
+	 * ISC_BUFFER_INCR seems like a good start.
 	 */
 	result = isc_buffer_allocate(zone->catzs->mctx, &buffer,
 				     ISC_BUFFER_INCR);
@@ -1531,15 +1532,34 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
 	isc_buffer_setautorealloc(buffer, ISC_TRUE);
 	isc_buffer_putstr(buffer, "zone ");
 	dns_name_totext(&entry->name, ISC_TRUE, buffer);
-	isc_buffer_putstr(buffer, " { type slave; masters { ");
+	isc_buffer_putstr(buffer, " { type slave; masters");
+
+	/*
+	 * DSCP value has no default, but when it is specified, it is identical
+	 * for all masters and cannot be overriden for a specific master IP, so
+	 * use the DSCP value set for the first master
+	 */
+	if (entry->opts.masters.count > 0 &&
+	    entry->opts.masters.dscps[0] != -1) {
+		isc_buffer_putstr(buffer, " dscp ");
+		snprintf(pbuf, sizeof(pbuf), "%u",
+			 entry->opts.masters.dscps[0]);
+		isc_buffer_putstr(buffer, pbuf);
+	}
+
+	isc_buffer_putstr(buffer, " { ");
 	for (i = 0; i < entry->opts.masters.count; i++) {
-		/* TODO port and DSCP */
 		isc_netaddr_fromsockaddr(&netaddr,
 					 &entry->opts.masters.addrs[i]);
 		isc_buffer_reserve(&buffer, INET6_ADDRSTRLEN);
 		result = isc_netaddr_totext(&netaddr, buffer);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 
+		isc_buffer_putstr(buffer, " port ");
+		snprintf(pbuf, sizeof(pbuf), "%u",
+			 isc_sockaddr_getport(&entry->opts.masters.addrs[i]));
+		isc_buffer_putstr(buffer, pbuf);
+
 		if (entry->opts.masters.keys[i] != NULL) {
 			isc_buffer_putstr(buffer, " key ");
 			result = dns_name_totext(entry->opts.masters.keys[i],