diff --git a/nic_handles_list b/nic_handles_list
index 71f8ab7..4d4b4d9 100644
--- a/nic_handles_list
+++ b/nic_handles_list
@@ -5,7 +5,7 @@
 -afrinic whois.afrinic.net
 -ap	whois.apnic.net
 -cznic	whois.nic.cz
--dk	whois.dk-hostmaster.dk
+-dk	whois.punktum.dk
 -il	whois.isoc.org.il
 -is	whois.isnic.is
 -kg	whois.kg
diff --git a/servers_charset_list b/servers_charset_list
index fa85e4e..32b0086 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -25,6 +25,7 @@ whois.nic.cz		utf-8
 whois.denic.de		utf-8
 whois.enum.denic.de	utf-8
 whois.dk-hostmaster.dk	utf-8		--charset=utf-8
+whois.punktum.dk	utf-8		--charset=utf-8
 whois.tld.ee		utf-8
 whois.eu		utf-8
 whois.fi		iso-8859-1
diff --git a/tld_serv_list b/tld_serv_list
index 92be200..a113dd2 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -134,7 +134,7 @@
 .cz	whois.nic.cz
 .de	whois.denic.de
 .dj	NONE		# http://www.dj/
-.dk	whois.dk-hostmaster.dk
+.dk	whois.punktum.dk
 .dm	whois.dmdomains.dm
 .do	whois.nic.do
 .dz	whois.nic.dz
diff --git a/whois.c b/whois.c
index 611d623..9e1ba32 100644
--- a/whois.c
+++ b/whois.c
@@ -688,7 +688,9 @@ char *queryformat(const char *server, const char *flags, const char *query)
     else if (strchr(query, ' ') || *flags) { }
     else if (streq(server, "whois.denic.de") && in_domain(query, "de"))
 	strcat(buf, "-T dn" DENIC_PARAM_ACE DENIC_PARAM_CHARSET " ");
-    else if (streq(server, "whois.dk-hostmaster.dk") && in_domain(query, "dk"))
+    else if ((streq(server, "whois.punktum.dk") ||
+		streq(server, "whois.dk-hostmaster.dk"))
+	    && in_domain(query, "dk"))
 	strcat(buf, "--show-handles ");
 
     /* mangle and add the query string */