diff --git a/config.h b/config.h
index 0d0fa0c..4313c00 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.5"
+#define VERSION "5.0.6"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index 09013eb..ee3b1b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+whois (5.0.6) unstable; urgency=medium
+
+  * Added new IPv4 allocations.
+  * Added the .priv.at, .xn--fiqs8s (.中国, China), .xn--fiqz9s
+    (.中國, China) and .xn--wgbh1c (.مصر, Egypt) TLD servers.
+  * Do not use the "AS" prefix for ASN queries to whois.arin.net.
+    (Closes: #583798)
+
+ -- Marco d'Itri <md@linux.it>  Sun, 11 Jul 2010 16:49:19 +0200
+
 whois (5.0.5) unstable; urgency=medium
 
   * Added the .xn--p1ai (.рф, Russian Federation) TLD server.
diff --git a/debian/control b/debian/control
index 18fb103..aa57c1d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: whois
 Section: net
 Priority: standard
 Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends: debhelper (>= 5), gettext, libidn11-dev
 
 Package: whois
diff --git a/ip_del_list b/ip_del_list
index 9c59bc4..c3918c9 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -107,8 +107,10 @@
 175.192.0.0/10	whois.nic.or.kr
 175.0.0.0/8	apnic
 176.0.0.0/8	ripe
+177.0.0.0/8	lacnic
 178.0.0.0/8	ripe
 180.0.0.0/8	apnic
+181.0.0.0/8	lacnic
 183.96.0.0/11	whois.nic.or.kr
 182.0.0.0/7	apnic
 186.0.0.0/7	lacnic
diff --git a/servers_charset.h b/servers_charset.h
index d8539ee..d695f9b 100644
--- a/servers_charset.h
+++ b/servers_charset.h
@@ -5,7 +5,8 @@
     { "whois.cira.ca",	"iso-8859-1",	NULL },
     { "whois.nic.ch",	"utf-8",	NULL },
     { "whois.nic.cl",	"iso-8859-1",	NULL },
-    { "whois.cnnic.net.cn",	"utf-8",	NULL },
+    { "whois.cnnic.cn",	"utf-8",	NULL },
+    { "cwhois.cnnic.cn",	"utf-8",	NULL },
     { "whois.nic.cz",	"utf-8",	NULL },
     { "whois.denic.de",	"utf-8",	NULL },
     { "whois.enum.denic.de",	"utf-8",	NULL },
diff --git a/servers_charset_list b/servers_charset_list
index d2b6e77..f4d3b03 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -7,7 +7,8 @@ whois.nic.br		iso-8859-1
 whois.cira.ca		iso-8859-1
 whois.nic.ch		utf-8
 whois.nic.cl		iso-8859-1
-whois.cnnic.net.cn	utf-8
+whois.cnnic.cn		utf-8
+cwhois.cnnic.cn		utf-8
 whois.nic.cz		utf-8
 whois.denic.de		utf-8
 whois.enum.denic.de	utf-8
diff --git a/tld_serv_list b/tld_serv_list
index 4135e97..ed0d40a 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -67,6 +67,7 @@
 .aq	NONE		# 2day.com
 .ar	WEB http://www.nic.ar/
 .as	whois.nic.as
+.priv.at whois.nic.priv.at	# "unofficial" SLD
 .at	whois.nic.at
 .au	whois.ausregistry.net.au
 .aw	NONE		# http://www.setarnet.aw/domreg.html
@@ -104,7 +105,7 @@
 .cl	whois.nic.cl
 .cm	WEB http://netcom.cm/whois.php
 .edu.cn	whois.edu.cn
-.cn	whois.cnnic.net.cn
+.cn	whois.cnnic.cn
 .uk.co	whois.uk.co
 .co	WEB https://www.nic.co/
 .cr	WEB http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
@@ -329,9 +330,11 @@
 .zm	NONE		# http://www.zamnet.zm/ser-isp/dnr.htm
 .zw	NONE		# http://www.zispa.co.zw/
 
+.xn--fiqs8s		cwhois.cnnic.cn		# China
+.xn--fiqz9s		cwhois.cnnic.cn		# China
 .xn--mgbaam7a8h		whois.aeda.net.ae	# United Arab Emirates
 .xn--mgberp4a5d4ar	whois.nic.net.sa	# Saudi Arabia
-.xn--wgbh1c		NONE			# Egypt
+.xn--wgbh1c		whois.dotmasr.eg	# Egypt
 .xn--p1ai		whois.ripn.net		# Russian Federation
 
 -dom	whois.networksolutions.com
diff --git a/whois.c b/whois.c
index c4fd39c..35576d9 100644
--- a/whois.c
+++ b/whois.c
@@ -559,6 +559,9 @@ char *queryformat(const char *server, const char *flags, const char *query)
 	strcat(buf, "AS ");
 	strcat(buf, query + 2);
     }
+    else if (!isripe && streq(server, "whois.arin.net") &&
+	    strncaseeq(query, "AS", 2) && isasciidigit(query[2]))
+	strcat(buf, query + 2);			/* strip the "AS" prefix */
     else if (!isripe && streq(server, "whois.arin.net") &&
 	    (p = strrchr(query, '/')))
 	strncat(buf, query, p - query);		/* strip the mask length */
diff --git a/whois.spec b/whois.spec
index 4c95769..5cc25f2 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.5
+Version: 5.0.6
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>