diff --git a/CHANGELOG b/CHANGELOG
index dd80101a3..5b86273be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Improvements to whois-ip.nse: fix an unhandled error when a referred-to
+  response could not be understood; add a new pattern to recognise a
+  LACNIC "record not found" type of response and update the way ARIN is
+  queried. [jah]
+
 Nmap 6.46 [2014-04-18]
 
 o [NSE] Made numerous improvements to ssl-heartbleed to provide
diff --git a/scripts/whois-ip.nse b/scripts/whois-ip.nse
index 2588b771c..93d255dac 100644
--- a/scripts/whois-ip.nse
+++ b/scripts/whois-ip.nse
@@ -1506,7 +1506,7 @@ function script_init( )
   nmap.registry.whois.whoisdb = {
     arin = {
       id = "arin",
-      hostname = "whois.arin.net", preflag = "+", postflag = "",
+      hostname = "whois.arin.net", preflag = "n +", postflag = "",
       longname = {"american registry for internet numbers"},
       fieldreq = nmap.registry.whois.fields_meta.arin,
       smallnet_rule = nmap.registry.whois.fields_meta.arin.ob_netnum.netrange,