diff --git a/CHANGES b/CHANGES
index 90d3bf22ce..608b06d801 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,8 +10,8 @@
 3446.	[port]		win32: Add source ID (see change #3400) to build.
 			[RT #31683]
 
-3445.	[bug]		Reject zone files with blank owner names immediately
-			after $ORIGIN directives. [RT #31848]
+3445.	[bug]		Warn about zone files with blank owner names
+			immediately after $ORIGIN directives. [RT #31848]
 
 3444.	[bug]		The NOQNAME proof was not being returned from cached
 			insecure responses. [RT #21409]
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 3a94b91433..e32d60b88a 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -152,9 +152,8 @@
 #define DNS_R_BROKENCHAIN		(ISC_RESULTCLASS_DNS + 106)
 #define DNS_R_EXPIRED			(ISC_RESULTCLASS_DNS + 107)
 #define DNS_R_NOTDYNAMIC 		(ISC_RESULTCLASS_DNS + 108)
-#define DNS_R_UNSAFENAME 		(ISC_RESULTCLASS_DNS + 109)
 
-#define DNS_R_NRESULTS			110	/*%< Number of results */
+#define DNS_R_NRESULTS			109	/*%< Number of results */
 
 /*
  * DNS wire format rcodes.
diff --git a/lib/dns/master.c b/lib/dns/master.c
index e701549acd..257b93899c 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1588,18 +1588,11 @@ load_text(dns_loadctx_t *lctx) {
 						sizeof(cbuf));
 				dns_name_format(ictx->origin, obuf,
 						sizeof(obuf));
-				(*callbacks->error)(callbacks,
+				(*callbacks->warn)(callbacks,
 					"%s:%lu: record with inherited "
 					"owner (%s) immediately after "
 					"$ORIGIN (%s)", source, line,
 					cbuf, obuf);
-				result = DNS_R_UNSAFENAME;
-				if (MANYERRS(lctx, result)) {
-					SETRESULT(lctx, result);
-					read_till_eol = ISC_TRUE;
-					continue;
-				} else if (result != ISC_R_SUCCESS)
-					goto insist_and_cleanup;
 			}
 		}
 
diff --git a/lib/dns/result.c b/lib/dns/result.c
index 31d5ef3642..c8bac8cd38 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -161,8 +161,7 @@ static const char *text[DNS_R_NRESULTS] = {
 	"not master",			       /*%< 105 DNS_R_NOTMASTER */
 	"broken trust chain",		       /*%< 106 DNS_R_BROKENCHAIN */
 	"expired",			       /*%< 107 DNS_R_EXPIRED */
-	"not dynamic",			       /*%< 108 DNS_R_NOTDYNAMIC */
-	"unsafe name",			       /*%< 109 DNS_R_UNSAFENAME */
+	"not dynamic"			       /*%< 108 DNS_R_NOTDYNAMIC */
 };
 
 static const char *rcode_text[DNS_R_NRCODERESULTS] = {
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 86a5142869..3b3de7b119 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -84,7 +84,9 @@ rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *h) {
 }
 
 static isc_result_t
-setup_master() {
+setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...),
+	     void (*error)(struct dns_rdatacallbacks *, const char *, ...)) 
+{
 	isc_result_t		result;
 	int			len;
 	isc_buffer_t		source;
@@ -108,14 +110,25 @@ setup_master() {
 	callbacks.add = add_callback;
 	callbacks.rawdata = rawdata_callback;
 	callbacks.zone = NULL;
-
+	if (warn != NULL)
+		callbacks.warn = warn;
+	if (error != NULL)
+		callbacks.error = error;
+	headerset = ISC_FALSE;
 	return (result);
 }
 
 static isc_result_t
-test_master(const char *testfile, dns_masterformat_t format) {
-	isc_result_t result;
-	headerset = ISC_FALSE;
+test_master(const char *testfile, dns_masterformat_t format,
+	    void (*warn)(struct dns_rdatacallbacks *, const char *, ...),
+	    void (*error)(struct dns_rdatacallbacks *, const char *, ...))
+{
+	isc_result_t		result;
+
+	result = setup_master(warn, error);
+	if (result != ISC_R_SUCCESS)
+		return(result);
+
 	result = dns_master_loadfile2(testfile, &dns_origin, &dns_origin,
 				      dns_rdataclass_in, ISC_TRUE,
 				      &callbacks, mctx, format);
@@ -146,9 +159,8 @@ ATF_TC_BODY(load, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master1.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -170,9 +182,8 @@ ATF_TC_BODY(unexpected, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master2.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_UNEXPECTEDEND);
 
 	dns_test_end();
@@ -194,9 +205,8 @@ ATF_TC_BODY(noowner, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master3.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, DNS_R_NOOWNER);
 
 	dns_test_end();
@@ -219,9 +229,8 @@ ATF_TC_BODY(nottl, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master4.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -243,9 +252,8 @@ ATF_TC_BODY(badclass, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master5.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, DNS_R_BADCLASS);
 
 	dns_test_end();
@@ -265,9 +273,8 @@ ATF_TC_BODY(toobig, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master15.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_NOSPACE);
 
 	dns_test_end();
@@ -288,9 +295,8 @@ ATF_TC_BODY(maxrdata, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master16.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -310,9 +316,8 @@ ATF_TC_BODY(dnskey, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master6.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -333,9 +338,8 @@ ATF_TC_BODY(dnsnokey, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master7.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -355,9 +359,8 @@ ATF_TC_BODY(include, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master8.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, DNS_R_SEENINCLUDE);
 
 	dns_test_end();
@@ -378,7 +381,9 @@ ATF_TC_BODY(master_includelist, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
+	result = setup_master(NULL, NULL);
+	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+
 	result = dns_master_loadfile4("testdata/master/master8.data",
 				      &dns_origin, &dns_origin,
 				      dns_rdataclass_in, 0, ISC_TRUE,
@@ -408,9 +413,8 @@ ATF_TC_BODY(includefail, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master9.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, DNS_R_BADCLASS);
 
 	dns_test_end();
@@ -431,9 +435,8 @@ ATF_TC_BODY(blanklines, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master10.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -453,9 +456,8 @@ ATF_TC_BODY(leadingzero, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
 	result = test_master("testdata/master/master11.data",
-			     dns_masterformat_text);
+			     dns_masterformat_text, NULL, NULL);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	dns_test_end();
@@ -520,25 +522,22 @@ ATF_TC_BODY(loadraw, tc) {
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
 	/* Raw format version 0 */
-	setup_master();
 	result = test_master("testdata/master/master12.data",
-			     dns_masterformat_raw);
+			     dns_masterformat_raw, NULL, NULL);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
 	ATF_CHECK_EQ(header.flags, 0);
 
 	/* Raw format version 1, no source serial  */
-	setup_master();
 	result = test_master("testdata/master/master13.data",
-			     dns_masterformat_raw);
+			     dns_masterformat_raw, NULL, NULL);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
 	ATF_CHECK_EQ(header.flags, 0);
 
 	/* Raw format version 1, source serial == 2011120101 */
-	setup_master();
 	result = test_master("testdata/master/master14.data",
-			     dns_masterformat_raw);
+			     dns_masterformat_raw, NULL, NULL);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
 	ATF_CHECK((header.flags & DNS_MASTERRAW_SOURCESERIALSET) != 0);
@@ -593,8 +592,7 @@ ATF_TC_BODY(dumpraw, tc) {
 				  dns_masterformat_raw);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
-	result = test_master("test.dump", dns_masterformat_raw);
+	result = test_master("test.dump", dns_masterformat_raw, NULL, NULL);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
 	ATF_CHECK_EQ(header.flags, 0);
@@ -609,8 +607,7 @@ ATF_TC_BODY(dumpraw, tc) {
 				  dns_masterformat_raw, &header);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
-	result = test_master("test.dump", dns_masterformat_raw);
+	result = test_master("test.dump", dns_masterformat_raw, NULL, NULL);
 	ATF_CHECK_STREQ(isc_result_totext(result), "success");
 	ATF_CHECK(headerset);
 	ATF_CHECK((header.flags & DNS_MASTERRAW_SOURCESERIALSET) != 0);
@@ -622,6 +619,23 @@ ATF_TC_BODY(dumpraw, tc) {
 	dns_test_end();
 }
 
+static const char *warn_expect_value;
+static isc_boolean_t warn_expect_result;
+
+static void
+warn_expect(struct dns_rdatacallbacks *callbacks, const char *fmt, ...) {
+	char buf[4096];
+	va_list ap;
+
+	UNUSED(callbacks);
+
+	va_start(ap, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, ap);
+	va_end(ap);
+	if (warn_expect_value != NULL && strstr(buf, warn_expect_value) != NULL)
+		warn_expect_result = ISC_TRUE;
+}
+
 /* Origin change test */
 ATF_TC(neworigin);
 ATF_TC_HEAD(neworigin, tc) {
@@ -637,10 +651,13 @@ ATF_TC_BODY(neworigin, tc) {
 	result = dns_test_begin(NULL, ISC_FALSE);
 	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
 
-	setup_master();
+	warn_expect_value = "record with inherited owner";
+	warn_expect_result = ISC_FALSE;
 	result = test_master("testdata/master/master17.data",
-			     dns_masterformat_text);
-	ATF_REQUIRE_EQ(result, DNS_R_UNSAFENAME);
+			     dns_masterformat_text, warn_expect, NULL);
+	ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+	ATF_CHECK_MSG(warn_expect_result, "'%s' warning not emitted",
+		      warn_expect_value);
 
 	dns_test_end();
 }