diff --git a/config.h b/config.h
index 51094d3..0d0fa0c 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.4"
+#define VERSION "5.0.5"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index bab8482..09013eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+whois (5.0.5) unstable; urgency=medium
+
+  * Added the .xn--p1ai (.рф, Russian Federation) TLD server.
+    (Closes: #581611)
+  * Updated the .ls TLD server. (Closes: #582077)
+
+ -- Marco d'Itri <md@linux.it>  Sun, 23 May 2010 03:17:45 +0200
+
 whois (5.0.4) unstable; urgency=high
 
   * Added new IPv4 allocations.
diff --git a/tld_serv_list b/tld_serv_list
index 2f20627..4135e97 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -1,3 +1,4 @@
+# http://www.iana.org/domains/root/db/
 # NIC? means I have not been able to find the registry
 
 .br.com	whois.centralnic.net
@@ -188,7 +189,7 @@
 .li	whois.nic.li
 .lk	whois.nic.lk
 .lr	NONE		# http://www.psg.com/dns/lr/
-.ls	WEB http://www.co.ls/data/co.asp
+.ls	WEB http://www.co.ls/co.asp
 .lt	whois.domreg.lt
 .lu	whois.dns.lu
 .lv	whois.nic.lv
@@ -331,6 +332,7 @@
 .xn--mgbaam7a8h		whois.aeda.net.ae	# United Arab Emirates
 .xn--mgberp4a5d4ar	whois.nic.net.sa	# Saudi Arabia
 .xn--wgbh1c		NONE			# Egypt
+.xn--p1ai		whois.ripn.net		# Russian Federation
 
 -dom	whois.networksolutions.com
 -org	whois.networksolutions.com
diff --git a/whois.c b/whois.c
index a17f19c..c4fd39c 100644
--- a/whois.c
+++ b/whois.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2009 by Marco d'Itri <md@linux.it>.
+ * Copyright 1999-2010 by Marco d'Itri <md@linux.it>.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,7 +52,12 @@
 /* hack */
 #define malloc(s) NOFAIL(malloc(s))
 #define realloc(p, s) NOFAIL(realloc(p, s))
+#ifdef strdup
+#undef strdup
+#define strdup(s) NOFAIL(__strdup(s))
+#else
 #define strdup(s) NOFAIL(strdup(s))
+#endif
 
 /* Global variables */
 int sockfd, verb = 0;
diff --git a/whois.spec b/whois.spec
index 21af9a9..4c95769 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.4
+Version: 5.0.5
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>