diff --git a/CHANGELOG b/CHANGELOG
index f0a9f6ca7..741eca32e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Removed ripeQuery.nse because we now have the much more robust
+  whois.nse which handles all the major registries. [Fyodor]
+
 o Removed showSSHVersion.nse. Its only real claim to fame was the
   ability to trick some SSH servers (including at least OpenSSH
   4.3p2-9etch3) into not logging the connection.  This trick doesn't
diff --git a/scripts/ripeQuery.nse b/scripts/ripeQuery.nse
deleted file mode 100644
index f232fb8ec..000000000
--- a/scripts/ripeQuery.nse
+++ /dev/null
@@ -1,38 +0,0 @@
-description = [[
-Connects to the RIPE database and displays the <code>role:</code> entry for the
-target's IP address.
-
-This script uses an external database. Your IP address and the IP address of
-the target will be sent to whois.ripe.net.
-]]
-author = "Diman Todorov <diman.todorov@gmail.com>"
-license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-
-categories = {"discovery", "external"}
-
-require "comm"
-require "ipOps"
-
-hostrule = function(host, port)
-	return not ipOps.isPrivate(host.ip)
-end
-
-action = function(host, port)
-	local status, result = comm.exchange("whois.ripe.net", 43, host.ip .. "\n")
-
-	if not status then
-		return
-	end
-
-	local value  = string.match(result, "role:(.-)\n")
-
-	if (value == "see http://www.iana.org.") then
-		value = nil
-	end
-
-	if (value == nil) then
-		return
-	end
-	
-	return "IP belongs to: " .. value:gsub("^%s*", "")
-end
diff --git a/scripts/script.db b/scripts/script.db
index 577c5ae4b..807306eb0 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -40,8 +40,6 @@ Entry{ category = "safe", filename = "whois.nse" }
 Entry{ category = "default", filename = "smb-os-discovery.nse" }
 Entry{ category = "discovery", filename = "smb-os-discovery.nse" }
 Entry{ category = "safe", filename = "smb-os-discovery.nse" }
-Entry{ category = "discovery", filename = "ripeQuery.nse" }
-Entry{ category = "external", filename = "ripeQuery.nse" }
 Entry{ category = "malware", filename = "strangeSMTPport.nse" }
 Entry{ category = "version", filename = "iax2Detect.nse" }
 Entry{ category = "discovery", filename = "smb-security-mode.nse" }