diff --git a/etc/hosts.allow b/etc/hosts.allow
index 3367bb621893..47d57d11f2ac 100644
--- a/etc/hosts.allow
+++ b/etc/hosts.allow
@@ -42,8 +42,8 @@ ALL : my.machine.example.com 192.0.2.35 : allow
 # To use IPv6 addresses you must enclose them in []'s
 ALL : [fe80::%fxp0]/10 : allow
 ALL : [fe80::]/10 : deny
-ALL : [3ffe:fffe:2:1:2:3:4:3fe1] : deny
-ALL : [3ffe:fffe:2:1::]/64 : allow
+ALL : [2001:db8:2:1:2:3:4:3fe1] : deny
+ALL : [2001:db8:2:1::]/64 : allow
 
 # Sendmail can help protect you against spammers and relay-rapers
 sendmail : localhost : allow
diff --git a/etc/rc.firewall6 b/etc/rc.firewall6
index e4a345ce1425..289b7dc64f94 100644
--- a/etc/rc.firewall6
+++ b/etc/rc.firewall6
@@ -115,9 +115,9 @@ case ${ipv6_firewall_type} in
 	#
 	# This needs more work
 	#
-	net="3ffe:505:2:1::"
+	net="2001:db8:2:1::"
 	prefixlen="64"
-	ip="3ffe:505:2:1::1"
+	ip="2001:db8:2:1::1"
 
 	setup_local
 
@@ -172,15 +172,15 @@ case ${ipv6_firewall_type} in
 
 	# set these to your outside interface network and prefixlen and ip
 	oif="ed0"
-	onet="3ffe:505:2:1::"
+	onet="2001:db8:2:1::"
 	oprefixlen="64"
-	oip="3ffe:505:2:1::1"
+	oip="2001:db8:2:1::1"
 
 	# set these to your inside interface network and prefixlen and ip
 	iif="ed1"
-	inet="3ffe:505:2:2::"
+	inet="2001:db8:2:2::"
 	iprefixlen="64"
-	iip="3ffe:505:2:2::1"
+	iip="2001:db8:2:2::1"
 
 	setup_local