Imported Debian version 4.6.1v4.6.1

14 files changed, 517 insertions, 613 deletions

diff --git a/Makefile b/Makefile
index ed75828..f6bc87f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ OPTS=-O2
 # Solaris
 #LDFLAGS=-lnsl -lsocket
 
-# linux (old libc)
+# obsolete linux (libc 5)
 #LDFLAGS=-lintl
 
 # FreeBSD
@@ -50,7 +50,7 @@ test:
 	open -- sh -c "while nc -l -p 43 127.0.0.1; do echo END; done"
 
 gnu:
-	tar czvvf gnu-whois.tgz Makefile* README TODO *list *.h whois.*
+	tar czvvf gnu-whois.tgz Makefile* README *list *.h whois.*
 
 pos:
 	cd po && $(MAKE)
diff --git a/TODO b/TODO
deleted file mode 100644
index 7ca452e..0000000
--- a/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-What about rwhois?
-
-Should support the refer attribute of RIPE-189 objects.
-
-Add Exodus rwhois server (e.g. 216.35.0.0/16).
-Add rwhois.verio.net:4321 (e.g. 192.204.0.0/16).
-
diff --git a/as_del_list b/as_del_list
index f58e067..c3b088a 100644
--- a/as_del_list
+++ b/as_del_list
@@ -33,6 +33,7 @@
 23552	24575	apnic
 24576	25599	ripe
 27648	28671	lacnic
+28672	29695	ripe
 
 # catch all: everything else comes from ARIN
 0	28671	arin
diff --git a/config.h b/config.h
index 0c74d6c..669bd55 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.6.0"
+#define VERSION "4.6.1"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index bb54b07..40ac3da 100644
--- a/data.h
+++ b/data.h
@@ -39,16 +39,6 @@ const char *ripe_servers_old[] = {
     NULL
 };
 
-#if 0
-const char *rwhois_servers[] = {
-    "whois.isi.edu",		/* V-1.0B9.2 */
-    "rwhois.rcp.net.pe",	/* V-1.5.3 */
-    "ns.twnic.net",		/* V-1.0B9 */
-    "dragon.seed.net.tw",	/* V-1.0B9.2 */
-    NULL
-};
-#endif
-
 const char *hide_strings[] = {
     "The Data in the VeriSign", "terms at any time.",		/* VERISIGN */
     "The data in Register", "By submitting",		    /* REGISTER.COM */
@@ -65,7 +55,7 @@ const char *hide_strings[] = {
     "Access to America Online", "time. By accessing",		/* AOL */
     "% Access and use restricted", "% http://www.icann",	/* GANDI */
     "NeuStar, Inc., the Registry", "rules.  For details",	/* us */
-    "The data in this whois", "to abide by these terms.",	/* enom */
+    "The data in this whois", "using our Whois information",	/* enom */
     NULL, NULL
 };
 
diff --git a/debian/changelog b/debian/changelog
index 1439b6c..3969c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+whois (4.6.1) unstable; urgency=medium
+
+  * Oops... queries for 64.0.0.0/2 were broken (Closes: #171575).
+  * Added new RIPE ASN block.
+  * Disable the timeout after the TCP handshake has been completed.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 12 Dec 2002 02:17:25 +0100
+
 whois (4.6.0) unstable; urgency=medium
 
   * Added .ai .bo, .bt, .dz, .gi, .pn, .tp and .uz TLDs.
@@ -12,447 +20,6 @@ whois (4.6.0) unstable; urgency=medium
   * The new default server is whois.arin.net since it will only be used
     for network names.
   * Implemented a 60 seconds timeout on queries (Closes: #170255).
+  * Changelog trimmed.
 
  -- Marco d'Itri <md@linux.it>  Thu, 28 Nov 2002 20:49:01 +0100
-
-whois (4.5.34) unstable; urgency=medium
-
-  * Added a new RIPE IPv4 allocation.
-
- -- Marco d'Itri <md@linux.it>  Sun, 24 Nov 2002 03:52:32 +0100
-
-whois (4.5.33) unstable; urgency=medium
-
-  * Added another RIPE IPv6 allocation.
-  * Fixed .net.au SLD.
-
- -- Marco d'Itri <md@linux.it>  Wed, 20 Nov 2002 03:50:49 +0100
-
-whois (4.5.32) unstable; urgency=medium
-
-  * Fixed .in TLD code.
-  * Updated .hk, ky, .nz TLDs.
-  * Added LACNIC ASN block.
-  * Added -uanic NIC handles.
-  * RPSL flags are not stripped anymore even if the server is unrecognized.
-
- -- Marco d'Itri <md@linux.it>  Sat, 16 Nov 2002 04:25:08 +0100
-
-whois (4.5.31) unstable; urgency=medium
-
-  * Added undocumented -V command line option.
-
- -- Marco d'Itri <md@linux.it>  Fri, 11 Oct 2002 17:35:18 +0200
-
-whois (4.5.30) unstable; urgency=medium
-
-  * Added support for -c flag.
-  * Updated .aero, .dk, .ee, .gr and .in TLD servers.
-  * Updated spanish translation.
-  * Updated whois query code for the new ARIN server (Closes: #160693).
-  * Reviewed all hide_strings[] (Closes: #161462).
-  * Added many Korean IP and ASN allocations.
-
- -- Marco d'Itri <md@linux.it>  Fri, 11 Oct 2002 14:24:25 +0200
-
-whois (4.5.29) unstable; urgency=medium
-
-  * Fixed mkpasswd -H (Closes: #149071).
-  * Updated .dk and .pk TLD servers (Closes: #155897).
-  * Updated LANIC and telstra IP allocations.
-
- -- Marco d'Itri <md@linux.it>  Sat, 22 Jun 2002 13:02:43 +0200
-
-whois (4.5.28) unstable; urgency=medium
-
-  * Updated .tt TLD server (Closes: #148771).
-
- -- Marco d'Itri <md@linux.it>  Sat,  1 Jun 2002 23:03:49 +0200
-
-whois (4.5.27) unstable; urgency=medium
-
-  * Added .ae TLD server.
-  * Updated .ag TLD server.
-
- -- Marco d'Itri <md@linux.it>  Fri, 31 May 2002 13:36:21 +0200
-
-whois (4.5.26) unstable; urgency=medium
-
-  * Added .tv and .us TLD servers (Closes: #144257).
-
- -- Marco d'Itri <md@linux.it>  Fri, 26 Apr 2002 03:31:48 +0200
-
-whois (4.5.25) unstable; urgency=medium
-
-  * Updated data for -H option.
-  * Updated .tk and .hr TLD servers (Closes: #140517).
-  * Updated mkpasswd (added --password-fd).
-
- -- Marco d'Itri <md@linux.it>  Fri,  5 Apr 2002 15:20:23 +0200
-
-whois (4.5.22) unstable; urgency=medium
-
-  * Added .bz, .gg, .ir, .je, .my TLD servers.
-  * Added -nicir and -denic NIC handles.
-  * Updated .hk TLD server.
-  * Updated ASN list.
-  * netsol-managed gTLD server changed to whois.crsnic.net (Closes: #132221).
-  * Updated hide_strings[] for netsol.
-  * Fixed bug which truncates password read from stdin (Closes: #137377).
-
- -- Marco d'Itri <md@linux.it>  Fri,  8 Mar 2002 18:00:11 +0100
-
-whois (4.5.21) unstable; urgency=medium
-
-  * Fixed stupid bug. (Closes: #132067).
-  * Added .re and .pm TLD servers.
-
- -- Marco d'Itri <md@linux.it>  Sun,  3 Feb 2002 17:28:02 +0100
-
-whois (4.5.20) unstable; urgency=medium
-
-  * Updated .dk TLD server (Closes: #130795).
-  * Added .ci, .mu and .sr TLD servers
-  * Fixed parsing of some IPv6 addresses.
-
- -- Marco d'Itri <md@linux.it>  Sat,  2 Feb 2002 00:56:56 +0100
-
-whois (4.5.19) unstable; urgency=medium
-
-  * Added .aero, .coop, .name and .pro TLD servers.
-  * Added more APNIC and JPNIC netblocks.
-
- -- Marco d'Itri <md@linux.it>  Tue, 15 Jan 2002 21:55:45 +0100
-
-whois (4.5.18) unstable; urgency=medium
-
-  * Added more KRNIC netblocks.
-
- -- Marco d'Itri <md@linux.it>  Tue,  8 Jan 2002 19:29:12 +0100
-
-whois (4.5.17) unstable; urgency=medium
-
-  * Updated .dk and .edu TLD servers.
-
- -- Marco d'Itri <md@linux.it>  Wed,  2 Jan 2002 05:27:23 +0100
-
-whois (4.5.16) unstable; urgency=low
-
-  * Added 220.0.0.0/8.
-
- -- Marco d'Itri <md@linux.it>  Fri,  7 Dec 2001 03:43:18 +0100
-
-whois (4.5.15) unstable; urgency=medium
-
-  * Added .museum TLD server.
-
- -- Marco d'Itri <md@linux.it>  Sun, 18 Nov 2001 15:12:52 +0100
-
-whois (4.5.14) unstable; urgency=medium
-
-  * Added 219.0.0.0/8.
-  * Updated spanish translation.
-  * Updated .hk TLD server.
-
- -- Marco d'Itri <md@linux.it>  Fri,  17 Oct 2001 20:57:26 +0200
-
-whois (4.5.13) unstable; urgency=medium
-
-  * Fixed "Password: " prompt printing when using mkpasswd --stdin.
-  * Updated .hm TLD server (Closes: #115719).
-
- -- Marco d'Itri <md@linux.it>  Fri,  5 Oct 2001 00:57:26 +0200
-
-whois (4.5.12) unstable; urgency=medium
-
-  * Updated .af, .biz and .info TLD servers.
-  * Fixed NLS support in mkpasswd.
-  * Fixed spurious warning message about RIPE flags.
-  * Make server selection code ignore trailing dots (Closes: #65325).
-  * Follow crsnic referrals only for domains (Closes: #78568).
-
- -- Marco d'Itri <md@linux.it>  Sun, 30 Sep 2001 16:06:37 +0200
-
-whois (4.5.11) unstable; urgency=medium
-
-  * Updated .vc TLD server.
-  * Fixed ugly stupid segfault (Closes: #113409).
-
- -- Marco d'Itri <md@linux.it>  Tue, 25 Sep 2001 01:55:06 +0200
-
-whois (4.5.10) unstable; urgency=medium
-
-  * The configuration file is optional (Closes: #113340).
-  * Updated .fi TLD server.
-
- -- Marco d'Itri <md@linux.it>  Mon, 24 Sep 2001 17:58:18 +0200
-
-whois (4.5.9) unstable; urgency=medium
-
-  * Updated last known ASN (Closes: #112775).
-  * Updated .am, .bi, .bm, .bo, .bs, .cg, .jo, .mn, .mo, .ni, .np, .pt,
-    .rw, .pk, .pl, .ps, .sv, .ug, .vn, .net.za, .org.za TLD servers.
-
- -- Marco d'Itri <md@linux.it>  Wed, 19 Sep 2001 21:45:22 +0200
-
-whois (4.5.8) unstable; urgency=medium
-
-  * Use a bigger internal buffer to parse server output (Closes: #109919).
-  * Added german translation (Closes: #103480).
-  * Added support for domains like eu.org and uk.com.
-  * Fixed non-ASCII locales.
-  * Added another DDN AS block, .info and .biz servers.
-  * Updated .au netblocks data, .ng, .ua and .za TLD servers.
-  * When mkpasswd output is redirected to a file only the hashed password
-    is printed.
-  * Made some cosmetic changes for solaris.
-
- -- Marco d'Itri <md@linux.it>  Sun, 26 Aug 2001 16:46:23 +0200
-
-whois (4.5.7) unstable; urgency=low
-
-  * Added -nicat and -il NIC handles (Closes: #94465).
-  * Greatly bloated mkpasswd now can read the password from the console
-    (Closes: #94826).
-
- -- Marco d'Itri <md@linux.it>  Tue,  5 Jun 2001 14:01:56 +0200
-
-whois (4.5.6) unstable; urgency=medium
-
-  * Fixed typo in the server name for .si.
-  * Added 80.0.0.0/7 allocation and -frnic NIC handles.
-  * Added Build-Depends (Closes: #90205).
-
- -- Marco d'Itri <md@linux.it>  Wed,  4 Apr 2001 01:27:53 +0200
-
-whois (4.5.5) unstable; urgency=low
-
-  * Added -itnic NIC handles.
-  * Updated AS list (Closes: #88920).
-
- -- Marco d'Itri <md@linux.it>  Sun,  1 Apr 2001 22:14:04 +0200
-
-whois (4.5.4) unstable; urgency=low
-
-  * Updated .at, .be, .cy, .cz, .ee, .gr, .il, .pl, .ro, .vi and .nz ccTLDs.
-  * Added -cz, -nicat, and -rotld NIC handles.
-  * Added telstra IP allocations.
-  * Fixed fencepost error (Closes: #83661).
-
- -- Marco d'Itri <md@linux.it>  Wed,  7 Mar 2001 00:45:33 +0100
-
-whois (4.5.3) unstable; urgency=low
-
-  * Updated .hr and level3 servers.
-  * Added .la and .by servers and updated some other data.
-  * Many RPSL fixes.
-  * Added BRAZIL-BLK[12] networks.
-  * Rechecked all missing ccTLDs.
-
- -- Marco d'Itri <md@linux.it>  Tue,  6 Feb 2001 18:29:37 +0100
-
-whois (4.5.2) unstable; urgency=low
-
-  * Added TWNIC netblocks.
-  * Fixed server name for .ca, .gr, .edu.cn and .ie (Closes: #77127, #78322).
-  * Added *-CN and *-DK NIC handles.
-  * Added servers for .cf and .gt.
-
- -- Marco d'Itri <md@linux.it>  Sun, 17 Dec 2000 02:16:11 +0100
-
-whois (4.5.1) unstable; urgency=low
-
-  * Portability fixes.
-  * Added KRNIC and JPNIC netblocks.
-  * Added new RIPE assignment.
-  * Fixed use of uninitialised memory (Closes: #76045, #76060).
-
- -- Marco d'Itri <md@linux.it>  Sun,  5 Nov 2000 13:11:37 +0100
-
-whois (4.5.0) unstable; urgency=low
-
-  * Added CentralNic (formerly NomiNation.net) servers.
-  * Added 151.99.0.0/16 prefix.
-  * Changed de and is TLD servers.
-  * Email addresses are not mistaken for domains anymore.
-  * Added $WHOIS_HIDE variable.
-  * Added getopt_long support and rearranged .h files.
-  * Removed obsolete #ifndef FIRST_ASK_INTERNIC.
-  * Added support for new RPSL query switches: -l, -x, -q.
-
- -- Marco d'Itri <md@linux.it>  Mon, 24 Jul 2000 23:47:26 +0200
-
-whois (4.4.14) frozen unstable; urgency=medium
-
-  * !=> HIDE_DISCL has been disabled (VERY IMPORTANT!).
-  * !=> Fixed -h option for gTLDs (Closes: 65001).
-  * !=> Priority changed from important to standard (Closes: #64460).
-  * !=> Added server for net.au (Closes: #64574).
-  * Fixed longstanding bug in RIPE-style referrals handling.
-  * Added telstra netblocks, NIC handles and whois server.
-  * Added fed.us domain.
-  * Added nic.mil AS block.
-  * Added production IPv6 TLA.
-
- -- Marco d'Itri <md@linux.it>  Sun,  4 Jun 2000 20:00:20 +0200
-
-whois (4.4.13) frozen unstable; urgency=high
-
-  * Fixed .dk and .nl servers (IMPORTANT!).
-  * Added many, many domains in tld_serv_list.
-  * A message is displayed if only a WWW gateway is available.
-
- -- Marco d'Itri <md@linux.it>  Fri, 21 Apr 2000 17:59:19 +0200
-
-whois (4.4.12) frozen unstable; urgency=medium
-
-  * Fixed queries for *.jp domains (Closes: #60861).
-  * Will hide disclaimers of many registries.
-  * Added support for level3.net registry.
-
- -- Marco d'Itri <md@linux.it>  Sat, 25 Mar 2000 11:51:01 +0100
-
-whois (4.4.11) frozen unstable; urgency=low
-
-  * Enlarged a buffer. This bug silently corrupted queries for some CORE
-    objects (Closes: #60612).
-
- -- Marco d'Itri <md@linux.it>  Fri, 17 Mar 2000 23:33:38 +0100
-
-whois (4.4.10) frozen unstable; urgency=low
-
-  * RIPE-like flags are allowed for CORENIC too.
-
- -- Marco d'Itri <md@linux.it>  Fri, 17 Mar 2000 23:30:46 +0100
-
-whois (4.4.9) frozen unstable; urgency=low
-
-  * Fixed segfault when requesting a RIPE template (Closes: #59030).
-
- -- Marco d'Itri <md@linux.it>  Sat, 26 Feb 2000 14:53:32 +0100
-
-whois (4.4.8) frozen unstable; urgency=low
-
-  * Fixed two off-by-one in mallocs and a buffer overflow.
-  * Fixed ugly bug in parsing of multi argument command lines.
-  * Fixed domcmp() to deal with -au-dom, .uk.net and so on.
-  * Added support for corenic and GANDI handles.
-  * Now automatically request machine parseable output from corenic.
-  * rr.arin.net added to the list of RIPE-like servers.
-
- -- Marco d'Itri <md@linux.it>  Wed, 23 Feb 2000 19:50:50 +0100
-
-whois (4.4.7) frozen unstable; urgency=low
-
-  * Updated .no ccTLD entry.
-  * Added RIPE as default server for limerick objects.
-  * Fixed $LANG parsing.
-  * Fixed false positive for netblock handles matching /^as/ and
-    another bug regarding parsing of AS queries.
-    (Dark, please allow this upload to go in frozen because users will
-     be bitten by these bug and will not understand what's happening.)
-
- -- Marco d'Itri <md@linux.it>  Sun, 16 Jan 2000 14:45:00 +0100
-
-whois (4.4.6) unstable; urgency=low
-
-  * Fixed bug in parsing the argument of -h.
-  * Added new ccTLDs: cl, kg, lu.
-  * Added AS-* netblocks. I assume only RIPE uses this format.
-  * Some additions to ripe_servers[].
-
- -- Marco d'Itri <md@linux.it>  Thu, 13 Jan 2000 01:16:51 +0100
-
-whois (4.4.5) unstable; urgency=low
-
-  * The InterNIC server is always asked to return complete records when a
-    query matches more than one object.
-  * s/CRSNIC/InterNIC/. Oh, how much I hate NSI!
-  * Added support for *jp NIC handles and *-MNT RIPE handles.
-  * Norwegian translation.
-
- -- Marco d'Itri <md@linux.it>  Sat, 18 Dec 1999 21:00:36 +0100
-
-whois (4.4.4) unstable; urgency=low
-
-  * The default server is read from $WHOIS_SERVER.
-
- -- Marco d'Itri <md@linux.it>  Sun,  5 Dec 1999 11:36:52 +0100
-
-whois (4.4.3) unstable; urgency=low
-
-  * s/whois.internic.net/whois.networksolutions.com/
-  * Added Oleane to ripe_servers[].
-
- -- Marco d'Itri <md@linux.it>  Thu,  2 Dec 1999 21:50:59 +0100
-
-whois (4.4.2) unstable; urgency=low
-
-  * Fixed the test for the use of RIPE-style options with non RIPE-like
-    servers.
-  * Cleanup of man page source.
-  * Fixed mkpasswd(1) header (closes: #51401).
-
- -- Marco d'Itri <md@linux.it>  Sun, 28 Nov 1999 12:51:25 +0100
-
-whois (4.4.1) unstable; urgency=low
-
-  * Converted some strcmp to strcasecmp.
-  * A space is added after "AS" when querying ARIN.
-  * The "domain" command keyword is added by default when querying ERNET.
-
- -- Marco d'Itri <md@linux.it>  Tue, 16 Nov 1999 11:57:55 +0100
-
-whois (4.4.0) unstable; urgency=low
-
-  * Now the program automatically select the right server for AS queries.
-  * Added RIPE allocations of netblocks in the B class space.
-  * Extensive survey of all known whois servers and update of tld_serv_list.
-  * Now the flag -VMd4.4 is sent to RIPE-like servers.
-  * Written a test program for checking if all servers work.
-
- -- Marco d'Itri <md@linux.it>  Tue,  9 Nov 1999 22:53:35 +0100
-
-whois (4.3.3) unstable; urgency=low
-
-  * Fixed man page (closes: #49195).
-
- -- Marco d'Itri <md@linux.it>  Sun,  7 Nov 1999 14:07:59 +0100
-
-whois (4.3.2) unstable; urgency=low
-
-  * Fixed version reporting code. Now the string is "-VMd2.0".
-
- -- Marco d'Itri <md@linux.it>  Tue,  2 Nov 1999 19:50:33 +0100
-
-whois (4.3.1) unstable; urgency=low
-
-  * CRSNIC code parsed the wrong field (closes: #48590).
-
- -- Marco d'Itri <md@linux.it>  Thu, 28 Oct 1999 22:21:55 +0200
-
-whois (4.3) unstable; urgency=low
-
-  * Corrected CRSNIC server hostname (closes: #48197).
-  * Updated delegation lists.
-
- -- Marco d'Itri <md@linux.it>  Tue, 26 Oct 1999 11:43:38 +0200
-
-whois (4.2) unstable; urgency=low
-
-  * Added support for the CRSNIC registry of GTLDs.
-
- -- Marco d'Itri <md@linux.it>  Wed, 20 Oct 1999 20:19:06 +0200
-
-whois (4.1) unstable; urgency=low
-
-  * Fixed $LANG parsing (closes: #47233).
-
- -- Marco d'Itri <md@linux.it>  Thu, 14 Oct 1999 22:23:13 +0200
-
-whois (4.0) unstable; urgency=low
-
-  * Initial Release of the new code: I rewrote the program from scratch.
-  * cryptpw become mkpasswd and now has a man page (closes: #46855).
-
- -- Marco d'Itri <md@linux.it>  Sun,  3 Oct 1999 19:43:35 +0200
diff --git a/debian/changelog.old b/debian/changelog.old
new file mode 100644
index 0000000..b5c4647
--- /dev/null
+++ b/debian/changelog.old
@@ -0,0 +1,442 @@
+
+whois (4.5.34) unstable; urgency=medium
+
+  * Added a new RIPE IPv4 allocation.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 24 Nov 2002 03:52:32 +0100
+
+whois (4.5.33) unstable; urgency=medium
+
+  * Added another RIPE IPv6 allocation.
+  * Fixed .net.au SLD.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 20 Nov 2002 03:50:49 +0100
+
+whois (4.5.32) unstable; urgency=medium
+
+  * Fixed .in TLD code.
+  * Updated .hk, ky, .nz TLDs.
+  * Added LACNIC ASN block.
+  * Added -uanic NIC handles.
+  * RPSL flags are not stripped anymore even if the server is unrecognized.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 16 Nov 2002 04:25:08 +0100
+
+whois (4.5.31) unstable; urgency=medium
+
+  * Added undocumented -V command line option.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 11 Oct 2002 17:35:18 +0200
+
+whois (4.5.30) unstable; urgency=medium
+
+  * Added support for -c flag.
+  * Updated .aero, .dk, .ee, .gr and .in TLD servers.
+  * Updated spanish translation.
+  * Updated whois query code for the new ARIN server (Closes: #160693).
+  * Reviewed all hide_strings[] (Closes: #161462).
+  * Added many Korean IP and ASN allocations.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 11 Oct 2002 14:24:25 +0200
+
+whois (4.5.29) unstable; urgency=medium
+
+  * Fixed mkpasswd -H (Closes: #149071).
+  * Updated .dk and .pk TLD servers (Closes: #155897).
+  * Updated LANIC and telstra IP allocations.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 22 Jun 2002 13:02:43 +0200
+
+whois (4.5.28) unstable; urgency=medium
+
+  * Updated .tt TLD server (Closes: #148771).
+
+ -- Marco d'Itri <md@linux.it>  Sat,  1 Jun 2002 23:03:49 +0200
+
+whois (4.5.27) unstable; urgency=medium
+
+  * Added .ae TLD server.
+  * Updated .ag TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 31 May 2002 13:36:21 +0200
+
+whois (4.5.26) unstable; urgency=medium
+
+  * Added .tv and .us TLD servers (Closes: #144257).
+
+ -- Marco d'Itri <md@linux.it>  Fri, 26 Apr 2002 03:31:48 +0200
+
+whois (4.5.25) unstable; urgency=medium
+
+  * Updated data for -H option.
+  * Updated .tk and .hr TLD servers (Closes: #140517).
+  * Updated mkpasswd (added --password-fd).
+
+ -- Marco d'Itri <md@linux.it>  Fri,  5 Apr 2002 15:20:23 +0200
+
+whois (4.5.22) unstable; urgency=medium
+
+  * Added .bz, .gg, .ir, .je, .my TLD servers.
+  * Added -nicir and -denic NIC handles.
+  * Updated .hk TLD server.
+  * Updated ASN list.
+  * netsol-managed gTLD server changed to whois.crsnic.net (Closes: #132221).
+  * Updated hide_strings[] for netsol.
+  * Fixed bug which truncates password read from stdin (Closes: #137377).
+
+ -- Marco d'Itri <md@linux.it>  Fri,  8 Mar 2002 18:00:11 +0100
+
+whois (4.5.21) unstable; urgency=medium
+
+  * Fixed stupid bug. (Closes: #132067).
+  * Added .re and .pm TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Sun,  3 Feb 2002 17:28:02 +0100
+
+whois (4.5.20) unstable; urgency=medium
+
+  * Updated .dk TLD server (Closes: #130795).
+  * Added .ci, .mu and .sr TLD servers
+  * Fixed parsing of some IPv6 addresses.
+
+ -- Marco d'Itri <md@linux.it>  Sat,  2 Feb 2002 00:56:56 +0100
+
+whois (4.5.19) unstable; urgency=medium
+
+  * Added .aero, .coop, .name and .pro TLD servers.
+  * Added more APNIC and JPNIC netblocks.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 15 Jan 2002 21:55:45 +0100
+
+whois (4.5.18) unstable; urgency=medium
+
+  * Added more KRNIC netblocks.
+
+ -- Marco d'Itri <md@linux.it>  Tue,  8 Jan 2002 19:29:12 +0100
+
+whois (4.5.17) unstable; urgency=medium
+
+  * Updated .dk and .edu TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed,  2 Jan 2002 05:27:23 +0100
+
+whois (4.5.16) unstable; urgency=low
+
+  * Added 220.0.0.0/8.
+
+ -- Marco d'Itri <md@linux.it>  Fri,  7 Dec 2001 03:43:18 +0100
+
+whois (4.5.15) unstable; urgency=medium
+
+  * Added .museum TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 18 Nov 2001 15:12:52 +0100
+
+whois (4.5.14) unstable; urgency=medium
+
+  * Added 219.0.0.0/8.
+  * Updated spanish translation.
+  * Updated .hk TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Fri,  17 Oct 2001 20:57:26 +0200
+
+whois (4.5.13) unstable; urgency=medium
+
+  * Fixed "Password: " prompt printing when using mkpasswd --stdin.
+  * Updated .hm TLD server (Closes: #115719).
+
+ -- Marco d'Itri <md@linux.it>  Fri,  5 Oct 2001 00:57:26 +0200
+
+whois (4.5.12) unstable; urgency=medium
+
+  * Updated .af, .biz and .info TLD servers.
+  * Fixed NLS support in mkpasswd.
+  * Fixed spurious warning message about RIPE flags.
+  * Make server selection code ignore trailing dots (Closes: #65325).
+  * Follow crsnic referrals only for domains (Closes: #78568).
+
+ -- Marco d'Itri <md@linux.it>  Sun, 30 Sep 2001 16:06:37 +0200
+
+whois (4.5.11) unstable; urgency=medium
+
+  * Updated .vc TLD server.
+  * Fixed ugly stupid segfault (Closes: #113409).
+
+ -- Marco d'Itri <md@linux.it>  Tue, 25 Sep 2001 01:55:06 +0200
+
+whois (4.5.10) unstable; urgency=medium
+
+  * The configuration file is optional (Closes: #113340).
+  * Updated .fi TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 24 Sep 2001 17:58:18 +0200
+
+whois (4.5.9) unstable; urgency=medium
+
+  * Updated last known ASN (Closes: #112775).
+  * Updated .am, .bi, .bm, .bo, .bs, .cg, .jo, .mn, .mo, .ni, .np, .pt,
+    .rw, .pk, .pl, .ps, .sv, .ug, .vn, .net.za, .org.za TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 19 Sep 2001 21:45:22 +0200
+
+whois (4.5.8) unstable; urgency=medium
+
+  * Use a bigger internal buffer to parse server output (Closes: #109919).
+  * Added german translation (Closes: #103480).
+  * Added support for domains like eu.org and uk.com.
+  * Fixed non-ASCII locales.
+  * Added another DDN AS block, .info and .biz servers.
+  * Updated .au netblocks data, .ng, .ua and .za TLD servers.
+  * When mkpasswd output is redirected to a file only the hashed password
+    is printed.
+  * Made some cosmetic changes for solaris.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 26 Aug 2001 16:46:23 +0200
+
+whois (4.5.7) unstable; urgency=low
+
+  * Added -nicat and -il NIC handles (Closes: #94465).
+  * Greatly bloated mkpasswd now can read the password from the console
+    (Closes: #94826).
+
+ -- Marco d'Itri <md@linux.it>  Tue,  5 Jun 2001 14:01:56 +0200
+
+whois (4.5.6) unstable; urgency=medium
+
+  * Fixed typo in the server name for .si.
+  * Added 80.0.0.0/7 allocation and -frnic NIC handles.
+  * Added Build-Depends (Closes: #90205).
+
+ -- Marco d'Itri <md@linux.it>  Wed,  4 Apr 2001 01:27:53 +0200
+
+whois (4.5.5) unstable; urgency=low
+
+  * Added -itnic NIC handles.
+  * Updated AS list (Closes: #88920).
+
+ -- Marco d'Itri <md@linux.it>  Sun,  1 Apr 2001 22:14:04 +0200
+
+whois (4.5.4) unstable; urgency=low
+
+  * Updated .at, .be, .cy, .cz, .ee, .gr, .il, .pl, .ro, .vi and .nz ccTLDs.
+  * Added -cz, -nicat, and -rotld NIC handles.
+  * Added telstra IP allocations.
+  * Fixed fencepost error (Closes: #83661).
+
+ -- Marco d'Itri <md@linux.it>  Wed,  7 Mar 2001 00:45:33 +0100
+
+whois (4.5.3) unstable; urgency=low
+
+  * Updated .hr and level3 servers.
+  * Added .la and .by servers and updated some other data.
+  * Many RPSL fixes.
+  * Added BRAZIL-BLK[12] networks.
+  * Rechecked all missing ccTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Tue,  6 Feb 2001 18:29:37 +0100
+
+whois (4.5.2) unstable; urgency=low
+
+  * Added TWNIC netblocks.
+  * Fixed server name for .ca, .gr, .edu.cn and .ie (Closes: #77127, #78322).
+  * Added *-CN and *-DK NIC handles.
+  * Added servers for .cf and .gt.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 17 Dec 2000 02:16:11 +0100
+
+whois (4.5.1) unstable; urgency=low
+
+  * Portability fixes.
+  * Added KRNIC and JPNIC netblocks.
+  * Added new RIPE assignment.
+  * Fixed use of uninitialised memory (Closes: #76045, #76060).
+
+ -- Marco d'Itri <md@linux.it>  Sun,  5 Nov 2000 13:11:37 +0100
+
+whois (4.5.0) unstable; urgency=low
+
+  * Added CentralNic (formerly NomiNation.net) servers.
+  * Added 151.99.0.0/16 prefix.
+  * Changed de and is TLD servers.
+  * Email addresses are not mistaken for domains anymore.
+  * Added $WHOIS_HIDE variable.
+  * Added getopt_long support and rearranged .h files.
+  * Removed obsolete #ifndef FIRST_ASK_INTERNIC.
+  * Added support for new RPSL query switches: -l, -x, -q.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 24 Jul 2000 23:47:26 +0200
+
+whois (4.4.14) frozen unstable; urgency=medium
+
+  * !=> HIDE_DISCL has been disabled (VERY IMPORTANT!).
+  * !=> Fixed -h option for gTLDs (Closes: 65001).
+  * !=> Priority changed from important to standard (Closes: #64460).
+  * !=> Added server for net.au (Closes: #64574).
+  * Fixed longstanding bug in RIPE-style referrals handling.
+  * Added telstra netblocks, NIC handles and whois server.
+  * Added fed.us domain.
+  * Added nic.mil AS block.
+  * Added production IPv6 TLA.
+
+ -- Marco d'Itri <md@linux.it>  Sun,  4 Jun 2000 20:00:20 +0200
+
+whois (4.4.13) frozen unstable; urgency=high
+
+  * Fixed .dk and .nl servers (IMPORTANT!).
+  * Added many, many domains in tld_serv_list.
+  * A message is displayed if only a WWW gateway is available.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 21 Apr 2000 17:59:19 +0200
+
+whois (4.4.12) frozen unstable; urgency=medium
+
+  * Fixed queries for *.jp domains (Closes: #60861).
+  * Will hide disclaimers of many registries.
+  * Added support for level3.net registry.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 25 Mar 2000 11:51:01 +0100
+
+whois (4.4.11) frozen unstable; urgency=low
+
+  * Enlarged a buffer. This bug silently corrupted queries for some CORE
+    objects (Closes: #60612).
+
+ -- Marco d'Itri <md@linux.it>  Fri, 17 Mar 2000 23:33:38 +0100
+
+whois (4.4.10) frozen unstable; urgency=low
+
+  * RIPE-like flags are allowed for CORENIC too.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 17 Mar 2000 23:30:46 +0100
+
+whois (4.4.9) frozen unstable; urgency=low
+
+  * Fixed segfault when requesting a RIPE template (Closes: #59030).
+
+ -- Marco d'Itri <md@linux.it>  Sat, 26 Feb 2000 14:53:32 +0100
+
+whois (4.4.8) frozen unstable; urgency=low
+
+  * Fixed two off-by-one in mallocs and a buffer overflow.
+  * Fixed ugly bug in parsing of multi argument command lines.
+  * Fixed domcmp() to deal with -au-dom, .uk.net and so on.
+  * Added support for corenic and GANDI handles.
+  * Now automatically request machine parseable output from corenic.
+  * rr.arin.net added to the list of RIPE-like servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 23 Feb 2000 19:50:50 +0100
+
+whois (4.4.7) frozen unstable; urgency=low
+
+  * Updated .no ccTLD entry.
+  * Added RIPE as default server for limerick objects.
+  * Fixed $LANG parsing.
+  * Fixed false positive for netblock handles matching /^as/ and
+    another bug regarding parsing of AS queries.
+    (Dark, please allow this upload to go in frozen because users will
+     be bitten by these bug and will not understand what's happening.)
+
+ -- Marco d'Itri <md@linux.it>  Sun, 16 Jan 2000 14:45:00 +0100
+
+whois (4.4.6) unstable; urgency=low
+
+  * Fixed bug in parsing the argument of -h.
+  * Added new ccTLDs: cl, kg, lu.
+  * Added AS-* netblocks. I assume only RIPE uses this format.
+  * Some additions to ripe_servers[].
+
+ -- Marco d'Itri <md@linux.it>  Thu, 13 Jan 2000 01:16:51 +0100
+
+whois (4.4.5) unstable; urgency=low
+
+  * The InterNIC server is always asked to return complete records when a
+    query matches more than one object.
+  * s/CRSNIC/InterNIC/. Oh, how much I hate NSI!
+  * Added support for *jp NIC handles and *-MNT RIPE handles.
+  * Norwegian translation.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 18 Dec 1999 21:00:36 +0100
+
+whois (4.4.4) unstable; urgency=low
+
+  * The default server is read from $WHOIS_SERVER.
+
+ -- Marco d'Itri <md@linux.it>  Sun,  5 Dec 1999 11:36:52 +0100
+
+whois (4.4.3) unstable; urgency=low
+
+  * s/whois.internic.net/whois.networksolutions.com/
+  * Added Oleane to ripe_servers[].
+
+ -- Marco d'Itri <md@linux.it>  Thu,  2 Dec 1999 21:50:59 +0100
+
+whois (4.4.2) unstable; urgency=low
+
+  * Fixed the test for the use of RIPE-style options with non RIPE-like
+    servers.
+  * Cleanup of man page source.
+  * Fixed mkpasswd(1) header (closes: #51401).
+
+ -- Marco d'Itri <md@linux.it>  Sun, 28 Nov 1999 12:51:25 +0100
+
+whois (4.4.1) unstable; urgency=low
+
+  * Converted some strcmp to strcasecmp.
+  * A space is added after "AS" when querying ARIN.
+  * The "domain" command keyword is added by default when querying ERNET.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 16 Nov 1999 11:57:55 +0100
+
+whois (4.4.0) unstable; urgency=low
+
+  * Now the program automatically select the right server for AS queries.
+  * Added RIPE allocations of netblocks in the B class space.
+  * Extensive survey of all known whois servers and update of tld_serv_list.
+  * Now the flag -VMd4.4 is sent to RIPE-like servers.
+  * Written a test program for checking if all servers work.
+
+ -- Marco d'Itri <md@linux.it>  Tue,  9 Nov 1999 22:53:35 +0100
+
+whois (4.3.3) unstable; urgency=low
+
+  * Fixed man page (closes: #49195).
+
+ -- Marco d'Itri <md@linux.it>  Sun,  7 Nov 1999 14:07:59 +0100
+
+whois (4.3.2) unstable; urgency=low
+
+  * Fixed version reporting code. Now the string is "-VMd2.0".
+
+ -- Marco d'Itri <md@linux.it>  Tue,  2 Nov 1999 19:50:33 +0100
+
+whois (4.3.1) unstable; urgency=low
+
+  * CRSNIC code parsed the wrong field (closes: #48590).
+
+ -- Marco d'Itri <md@linux.it>  Thu, 28 Oct 1999 22:21:55 +0200
+
+whois (4.3) unstable; urgency=low
+
+  * Corrected CRSNIC server hostname (closes: #48197).
+  * Updated delegation lists.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 26 Oct 1999 11:43:38 +0200
+
+whois (4.2) unstable; urgency=low
+
+  * Added support for the CRSNIC registry of GTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 20 Oct 1999 20:19:06 +0200
+
+whois (4.1) unstable; urgency=low
+
+  * Fixed $LANG parsing (closes: #47233).
+
+ -- Marco d'Itri <md@linux.it>  Thu, 14 Oct 1999 22:23:13 +0200
+
+whois (4.0) unstable; urgency=low
+
+  * Initial Release of the new code: I rewrote the program from scratch.
+  * cryptpw become mkpasswd and now has a man page (closes: #46855).
+
+ -- Marco d'Itri <md@linux.it>  Sun,  3 Oct 1999 19:43:35 +0200
diff --git a/debian/rules b/debian/rules
index aec300d..1bd700b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ binary-arch: checkroot build
 	install whois mkpasswd debian/tmp/usr/bin/
 	cd po && make install BASEDIR=../debian/tmp
 	dh_installmanpages
-	dh_installdocs README TODO
+	dh_installdocs README
 	dh_installchangelogs 
 	dh_strip
 	dh_compress
diff --git a/ip_del_list b/ip_del_list
index e0dff2a..f25e5e1 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -10,16 +10,14 @@
 61.80.0.0/14	whois.nic.or.kr
 61.84.0.0/15	whois.nic.or.kr
 61.112.0.0/12	whois.nic.ad.jp
-61.192.0.0/12	whois.nic.ad.jp		# => 61.207
-61.208.0.0/13	whois.nic.ad.jp		# => 61.215
+61.192.0.0/12	whois.nic.ad.jp		# => 61.207.255.255
+61.208.0.0/13	whois.nic.ad.jp		# => 61.215.255.255
 61.0.0.0/8	apnic
 62.0.0.0/8	ripe
-# broken?
-# 63.208.0.0/13	rr.level3.net
 80.0.0.0/7	ripe
 82.0.0.0/8	ripe
 96.0.0.0/3	UNALLOCATED
-0.0.0.0/2	arin	# all other A classes are managed by ARIN
+0.0.0.0/1	arin	# all other A classes are managed by ARIN
 133.0.0.0/8	whois.nic.ad.jp
 139.20.0.0/14	ripe
 139.24.0.0/14	ripe
diff --git a/test-whois.pl b/test-whois.pl
deleted file mode 100755
index a68475a..0000000
--- a/test-whois.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl -w
-
-use IO::Socket;
-use strict;
-
-my %check=(
-	'whois.io'	=> 'whois.io',
-	'whois.nic.cx'	=> 'nic.cx',
-	'whois.nic.gi'	=> 'nic.gi',
-	'whois.nic.ly'	=> 'nic.ly',
-	'whois.nic.pw'	=> 'nic.pw',
-	'whois.nic.so'	=> 'nic.so',
-	'whois.nic.st'	=> 'nic.st',
-	'whois.uprr.pr'	=> 'uprr.pr',
-	'whois.nplus.gf'	=> 'nplus.gf',
-	'rwhois.reacciun.ve'	=> 'reacciun.ve',
-	'whois.adamsnames.tc'	=> 'adamsnames.vg',
-	'whois.idnic.net.id'	=> 'idnic.net.id',
-	'whois.ncst.ernet.in'	=> 'ncst.ernet.in',
-);
-
-my @ripetest=('-V wC2.0', '-V2.0Md', '-VMd4.4');
-my %ripeserv=qw(
-	whois.ripe.net	dfn.de
-	whois.aunic.net	connect.com.au
-	whois.connect.com.au connect.com.au
-	whois.ra.net	AS1
-	whois.apnic.net	24.192.0.0
-	whois.nic.it	nic.it
-	whois.ans.net	AS1
-	whois.ripn.net	demos.su
-	whois.nic.fr	nic.fr
-	whois.nic.net.sg	nic.net.sg
-	whois.metu.edu.tr metu.edu.tr
-);
-
-open(LIST, 'tld_serv_list');
-while (<LIST>) {
-	chomp;
-	next if /^#/;
-	my ($tld, $serv, $junk)=split;
-	next unless ($tld =~/\.[a-z]{2}$/);	# skip non-cctld
-	# I'm sure these won't move without notifying...
-	next if ($serv =~ /(?:isi\.edu|internic.net)/);
-
-	if ($serv eq 'whois.ripe.net') {
-		$tld =~ s/^\.//;
-		print ">>>>>>>>>Querying $serv ($tld) for $tld<<<<<<<<<<\n";
-		print whois("-i domain $tld", $serv);	# untested
-		print "\n";
-		next;
-	}
-	my $q;
-	if ($serv =~ /$tld$/) {
-		$q = $serv; $q =~ s/.*\.([-a-z0-9]+?\...)$/$1/;	# we know a real domain
-	} else {
-		$q = "nic$tld";		# make a random domain and try anyway
-	}
-	$tld =~ s/^\.//;
-	print ">>>>>>>>>Querying $serv ($tld) for $q<<<<<<<<<<\n";
-	print whois($q, $serv);
-	print "\n";
-}
-close LIST;
-
-print "#" x 78 . "\n";
-foreach (keys %check) {
-	print ">>>>>>>>>Querying $_ for $check{$_}<<<<<<<<<<\n";
-	print whois($check{$_}, $_);
-	print "\n";
-}
-exit 0;
-
-print "#" x 78 . "\n";
-foreach my $s (keys %ripeserv) {
-	foreach (@ripetest) {
-		my $q = "$_ $ripeserv{$s}";
-		print ">>>>>>>>>Querying $s for $q<<<<<<<<<<\n";
-		print whois($q, $s);
-		print "\n";
-	}
-}
-exit 0;
-
-sub whois {
-	my ($query, $serv, $port) = @_;
-	my (@result, $remote);
-
-	eval {
-		local $^W=0;
-		$remote = IO::Socket::INET->new(
-			Timeout => 15, PeerAddr => $serv, PeerPort => $port || 43
-		);
-	};
-	if (defined $remote and ($@ eq '')) {
-		print $remote "$query\r\n";
-		@result = <$remote>;
-		close $remote;
-	} elsif ($@ ne '') {
-		@result = ("FATAL: $@");
-	} else {
-# FIXME should disconnect from rwhois servers or the connection will hang
-# until the timeout of the server
-		@result = ("$!\n");
-	}
-	return @result;
-}
-
diff --git a/whois.1 b/whois.1
index 9f3509f..13aa034 100644
--- a/whois.1
+++ b/whois.1
@@ -1,34 +1,34 @@
-.TH WHOIS 1 "3 December 1999" "Marco d'Itri" "Debian GNU/Linux"
-.SH NAME
+.TH "WHOIS" "1" "3 December 1999" "Marco d'Itri" "Debian GNU/Linux"
+.SH "NAME"
 whois \- client for the whois directory service
-.SH SYNOPSIS
+.SH "SYNOPSIS"
 .B whois
-[\~\fB-h\fP\~\fIHOST\fP\~]
-[\~\fB-p\fP\~ \fIPORT\fP\~]
-[\~\fB-aCFHlLMmrRSVx\fP\~]
-[\~\fB-g\fP\~\fISOURCE:FIRST-LAST\fP\~]
-[\~\fB-i\fP\~\fIATTR\fP\~]
-[\~\fB-S\fP\~\fISOURCE\fP\~]
-[\~\fB-T\fP\~\fITYPE\fP\~]
+[\~\fB\-h\fP\~\fIHOST\fP\~]
+[\~\fB\-p\fP\~ \fIPORT\fP\~]
+[\~\fB\-aCFHlLMmrRSVx\fP\~]
+[\~\fB\-g\fP\~\fISOURCE:FIRST\-LAST\fP\~]
+[\~\fB\-i\fP\~\fIATTR\fP\~]
+[\~\fB\-S\fP\~\fISOURCE\fP\~]
+[\~\fB\-T\fP\~\fITYPE\fP\~]
 .I object
 
 .B whois
-[\~\fI-t\fP\~]
-[\~\fI-v\fP\~]
+[\~\fI\-t\fP\~]
+[\~\fI\-v\fP\~]
 .I template
 .B whois
-[\~\fI-q\fP\~]
+[\~\fI\-q\fP\~]
 .I keyword
-.PP
-.SH DESCRIPTION
-\fBwhois\fP searches for an object in a \fIRFC-812\fP database.
+.PP 
+.SH "DESCRIPTION"
+\fBwhois\fP searches for an object in a \fIRFC\-812\fP database.
 
 This version of the whois client tries to guess the right server to
 ask for the specified object. If no guess can be made it will connect
 to whois.networksolutions.com for nic handles or whois.arin.net for
 IPv4 addresses and network names.
-.PP
-.SH OPTIONS
+.PP 
+.SH "OPTIONS"
 .TP 8
 .B \-h HOST
 Connect to HOST.
@@ -39,14 +39,14 @@ Do not display the legal disclaimers some registries like to show you.
 .B \-p PORT
 Connect to PORT.
 .TP 8
-.B \--verbose
+.B \-\-verbose
 Be verbose.
 .TP 8
-.B \--help
+.B \-\-help
 Display online help.
 .TP 8
-Other options are flags understood by RIPE-like servers.
-.SH NOTES
+Other options are flags understood by RIPE\-like servers.
+.SH "NOTES"
 Please remember that \fIwhois.networksolutions.com\fP by default will
 only search in the domains database. If you want to search for NIC handles
 you have to prepend a \fI!\fP character. When you do this, the default
@@ -58,10 +58,15 @@ a space after the string "AS".
 .P
 When querying \fIwhois.corenic.net\fP, machine readable output is requested.
 .P
-RIPE-specific options are ignored when querying non-RIPE servers.
-.SH Files
+RIPE\-specific options are ignored when querying non\-RIPE servers.
+.P
+If the \fI/etc/whois.conf\fR config file exists, it will be consulted
+to find a server before applying the normal rules. Each line of the
+file should contain a regular expression to be matched against the query
+text and the whois server to use, separated by white space.
+.SH "Files"
 /etc/whois.conf
-.SH ENVIRONMENT
+.SH "ENVIRONMENT"
 .IP LANG
 When querying \fIwhois.nic.ad.jp\fP english text is requested unless the
 \fILANG\fP environment variable specifies a Japanese locale.
@@ -71,23 +76,23 @@ of objects are located. If the variable does not exist then
 \fIwhois.arin.net\fP will be queried.
 .IP "WHOIS_HIDE"
 If this variable is defined, legal disclaimers will be hidden even if
-the \fI-H\fP flag is not used.
+the \fI\-H\fP flag is not used.
 .SH "SEE ALSO"
 \fIRFC 812\fP: NICNAME/WHOIS
-.PP
-\fIRIPE-223\fP: RIPE NCC Database Documentation
-.PP
-Detailed help on available flags can be found in \fIRIPE-223\fP or in
+.PP 
+\fIRIPE\-223\fP: RIPE NCC Database Documentation
+.PP 
+Detailed help on available flags can be found in \fIRIPE\-223\fP or in
 the help file which can be obtained with the command:
-.IP
-.B whois -h whois.ripe.net HELP
-.SH HISTORY
+.IP 
+.B whois \-h whois.ripe.net HELP
+.SH "HISTORY"
 This program closely tracks the user interface of the whois client
 developed at RIPE by Ambrose Magee and others on the base of the
 original BSD client.
 I also added support for the protocol extensions developed by David
 Kessens of QWest for the 6bone server.
-.SH AUTHOR
+.SH "AUTHOR"
 .B Whois
 and this man page were written by Marco d'Itri <\fImd@linux.it\fP>
 and are licensed under the GPL.
diff --git a/whois.c b/whois.c
index f79cca9..9419cca 100644
--- a/whois.c
+++ b/whois.c
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
 	usage();
 
     /* On some systems realloc only works on non-NULL buffers */
-    qstring = malloc(1);
+    qstring = malloc(64);
     *qstring = '\0';
 
     /* parse other parameters, if any */
@@ -212,6 +212,12 @@ int main(int argc, char *argv[])
     strcat(p, "\r\n");
 
     sockfd = openconn(server, port);
+
+    /*
+     * Now we are connected and the query is supposed to complete quickly.
+     * This will help people who run whois ... | less
+     */
+    alarm(0);
     do_query(sockfd, p);
 
     exit(0);
diff --git a/whois.conf b/whois.conf
new file mode 100644
index 0000000..4a41d83
--- /dev/null
+++ b/whois.conf
@@ -0,0 +1,10 @@
+# GNU whois configuration file
+#
+# This file can contain details of alternative whois servers to use if
+# the compiled in servers are not suitable.  Each entry is a single
+# text line and consists of a regular expression pattern to match, and
+# the whois server to use, separated by a space. 
+#
+# Eg: 
+# .nz nz.whois-servers.net
+#
diff --git a/whois.spec b/whois.spec
index fae659c..75f1bb0 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.6.0
+Version: 4.6.1
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>