diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
index 2fb72d8fce19..57b7bf5252f8 100644
--- a/etc/namedb/named.conf
+++ b/etc/namedb/named.conf
@@ -125,7 +125,7 @@ zone "in-addr.arpa" {
 	1. Faster local resolution for your users
 	2. No spurious traffic will be sent from your network to the roots
 */
-// RFC 1912
+// RFC 1912 (and BCP 32 for localhost)
 zone "localhost"	{ type master; file "/etc/namedb/master/localhost-forward.db"; };
 zone "127.in-addr.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
 zone "255.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
@@ -159,8 +159,21 @@ zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; }
 // Link-local/APIPA (RFCs 3330 and 3927)
 zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
 
-// TEST-NET for Documentation (RFC 3330)
+// TEST-NET-[1-3] for Documentation (RFC 5737)
 zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+
+// IPv6 Range for Documentation (RFC 3849)
+zone "0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+
+// Domain Names for Documentation and Testing (BCP 32)
+zone "test" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example" { type master; file "/etc/namedb/master/empty.db"; };
+zone "invalid" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.com" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.net" { type master; file "/etc/namedb/master/empty.db"; };
+zone "example.org" { type master; file "/etc/namedb/master/empty.db"; };
 
 // Router Benchmark Testing (RFC 3330)
 zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };