diff --git a/CHANGES b/CHANGES
index 12ed48f51d..be7484202d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+1043.	[bug]		Specifying a transfer-source or transfer-source-v6
+			option in the zone statement for a master zone was
+			not treated as an error. [RT #1876]
+
 1042.	[bug]		The "config" logging category did not work properly.
 			[RT #1873]
 
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 7c3340e9d7..3da7ba5a26 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.93 2001/09/25 23:01:15 gson Exp $ */
+/* $Id: zoneconf.c,v 1.94 2001/10/11 01:55:01 gson Exp $ */
 
 #include <config.h>
 
@@ -541,16 +541,6 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 					  dns_zone_clearforwardacl));
 	}
 
-	obj = NULL;
-	result = ns_config_get(maps, "transfer-source", &obj);
-	INSIST(result == ISC_R_SUCCESS);
-	dns_zone_setxfrsource4(zone, cfg_obj_assockaddr(obj));
-
-	obj = NULL;
-	result = ns_config_get(maps, "transfer-source-v6", &obj);
-	INSIST(result == ISC_R_SUCCESS);
-	dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj));
-
 	/*
 	 * Configure slave functionality.
 	 */
@@ -603,6 +593,16 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 		INSIST(result == ISC_R_SUCCESS);
 		dns_zone_setminretrytime(zone, cfg_obj_asuint32(obj));
 
+		obj = NULL;
+		result = ns_config_get(maps, "transfer-source", &obj);
+		INSIST(result == ISC_R_SUCCESS);
+		dns_zone_setxfrsource4(zone, cfg_obj_assockaddr(obj));
+
+		obj = NULL;
+		result = ns_config_get(maps, "transfer-source-v6", &obj);
+		INSIST(result == ISC_R_SUCCESS);
+		dns_zone_setxfrsource6(zone, cfg_obj_assockaddr(obj));
+
 		break;
 
 	default:
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index e4ecfe4e73..4be18de89d 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.2 2001/10/04 18:22:57 bwelling Exp $ */
+/* $Id: check.c,v 1.3 2001/10/11 01:55:03 gson Exp $ */
 
 #include <config.h>
 
@@ -129,8 +129,8 @@ check_zoneconf(cfg_obj_t *zconfig, isc_symtab_t *symtab,
 	{ "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE},
 	{ "maintain-ixfr-base", MASTERZONE | SLAVEZONE },
 	{ "max-ixfr-log-size", MASTERZONE | SLAVEZONE },
-	{ "transfer-source", MASTERZONE | SLAVEZONE | STUBZONE },
-	{ "transfer-source-v6", MASTERZONE | SLAVEZONE | STUBZONE },
+	{ "transfer-source", SLAVEZONE | STUBZONE },
+	{ "transfer-source-v6", SLAVEZONE | STUBZONE },
 	{ "max-transfer-time-in", SLAVEZONE | STUBZONE },
 	{ "max-transfer-time-out", MASTERZONE | SLAVEZONE },
 	{ "max-transfer-idle-in", SLAVEZONE | STUBZONE },