--- jwhois-3.2.3/example/jwhois.conf.ipv6	2006-05-15 02:47:12.000000000 +0200
+++ jwhois-3.2.3/example/jwhois.conf	2006-05-15 02:49:32.000000000 +0200
@@ -90,12 +90,39 @@
 	# ...
 	"^2001:5[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
 	# ...
-	"^2001:[89A][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-
+	"^2001:[89AB][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# 2003:0000::/18
+	"^2003:[0123][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	# 2400:0000::/19
+	"^2400:[01][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# 2400:2000::/19
+	"^2400:[23][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# 2400:4000::/21
+	"^2400:4[0-7][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# 2404:0000::/23
+	"^2404:0?[01][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
+	# 2600:0000::/22
+	"^2600:0?[0-3][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# 2604:0000::/22
+	"^2604:0?[0-3][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# 2608:0000::/22
+	"^2608:0?[0-3][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# 260C:0000::/22
+	"^260C:0?[0-3][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# 2610:0000::/23
+	"^2610:0?[0-1][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
+	# 2800:0000::/23
+	"^2800:0?[0-1][A-F0-9][A-F0-9]:.+" = "whois.lacnic.net";
+	# 2A00:0000::/21
+	"^2A00:0?[0-7][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	# 2A01:0000::/16
+	"^2A01:[A-F0-9][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
+	
 	#
-	# Historical IPv6 catch-all
+	# Experimental IPv6 network 6bone (RFC2471)
+	# Phaseout at Jun, 6 2006 (RFC3701)
 	#
-	".*:.*" = "whois.6bone.net";
+	"^3FFE:.+" = "whois.6bone.net";
 
 	#
 	# If your host and network supports it, you can also specify IPv6