--- whois-4.7.33-orig/whois.c	2009-03-02 03:42:25 +0900
+++ whois-4.7.33/whois.c	2009-05-25 16:10:49 +0900
@@ -786,8 +786,12 @@
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_flags = AI_ADDRCONFIG | AI_IDN;
 
-    if ((err = getaddrinfo(server, port ? port : "nicname", &hints, &res))
-	    != 0) {
+    err = getaddrinfo(server, port ? port : "nicname", &hints, &res);
+    if (err == EAI_BADFLAGS) {
+	hints.ai_flags &= ~AI_IDN;
+	err = getaddrinfo(server, port ? port : "nicname", &hints, &res);
+    }
+    if (err != 0) {
 	if (err == EAI_SYSTEM)
 	    err_sys("getaddrinfo(%s)", server);
 	else