diff --git a/CHANGELOG b/CHANGELOG
index e06a1cb31..58f008e30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#2016] Removed hostmap-bfk.nse, since the service it used shut down.
+
 o Fixed several issues reported by Himanshu Anand: infinite loop in TCP options
   parsing and out-of-bounds memory read in IPv4 OS detection; integer underflow
   in IPv6 extension header processing; and undefined behavior in DNS label parsing.
diff --git a/scripts/hostmap-bfk.nse b/scripts/hostmap-bfk.nse
deleted file mode 100644
index f28a8ae37..000000000
--- a/scripts/hostmap-bfk.nse
+++ /dev/null
@@ -1,130 +0,0 @@
-local http = require "http"
-local io = require "io"
-local ipOps = require "ipOps"
-local stdnse = require "stdnse"
-local string = require "string"
-local stringaux = require "stringaux"
-local table = require "table"
-local target = require "target"
-
-description = [[
-Discovers hostnames that resolve to the target's IP address by querying the online database at http://www.bfk.de/bfk_dnslogger.html.
-
-The script is in the "external" category because it sends target IPs to a third party in order to query their database.
-
-This script was formerly (until April 2012) known as hostmap.nse.
-]]
-
----
--- @args hostmap-bfk.prefix If set, saves the output for each host in a file
--- called "<prefix><target>". The file contains one entry per line.
--- @args newtargets If set, add the new hostnames to the scanning queue.
--- This the names presumably resolve to the same IP address as the
--- original target, this is only useful for services such as HTTP that
--- can change their behavior based on hostname.
---
--- @usage
--- nmap --script hostmap-bfk --script-args hostmap-bfk.prefix=hostmap- <targets>
---
--- @output
--- Host script results:
--- | hostmap-bfk:
--- |   hosts:
--- |     insecure.org
--- |     173.255.243.189
--- |     images.insecure.org
--- |     www.insecure.org
--- |     nmap.org
--- |     189.243.255.173.in-addr.arpa
--- |     mail.nmap.org
--- |     svn.nmap.org
--- |     www.nmap.org
--- |     sectools.org
--- |     seclists.org
--- |_    li253-189.members.linode.com
---
--- @xmloutput
--- <table key="hosts">
---  <elem>insecure.org</elem>
---  <elem>173.255.243.189</elem>
---  <elem>images.insecure.org</elem>
---  <elem>www.insecure.org</elem>
---  <elem>nmap.org</elem>
---  <elem>189.243.255.173.in-addr.arpa</elem>
---  <elem>mail.nmap.org</elem>
---  <elem>svn.nmap.org</elem>
---  <elem>www.nmap.org</elem>
---  <elem>sectools.org</elem>
---  <elem>seclists.org</elem>
---  <elem>li253-189.members.linode.com</elem>
--- </table>
----
-
-author = "Ange Gutek"
-
-license = "Same as Nmap--See https://nmap.org/book/man-legal.html"
-
-categories = {"external", "discovery"}
-
-
-local HOSTMAP_SERVER = "www.bfk.de"
-
-local write_file
-
-hostrule = function(host)
-  return not ipOps.isPrivate(host.ip)
-end
-
-action = function(host)
-  local query = "/bfk_dnslogger.html?query=" .. host.ip
-  local response
-  local output_tab = stdnse.output_table()
-  response = http.get(HOSTMAP_SERVER, 80, query, {any_af=true})
-  if not response.status then
-    stdnse.debug1("Error: could not GET http://%s%s", HOSTMAP_SERVER, query)
-    return nil
-  end
-  local hostnames = {}
-  local hosts_log = {}
-  for entry in string.gmatch(response.body, "#result\" rel=\"nofollow\">(.-)</a></tt>") do
-    if not hostnames[entry] then
-      if target.ALLOW_NEW_TARGETS then
-        local status, err = target.add(entry)
-      end
-      hostnames[entry] = true
-      hosts_log[#hosts_log + 1] = entry
-    end
-  end
-
-  if #hosts_log == 0 then
-    if not string.find(response.body, "<p>The server returned no hits.</p>") then
-      stdnse.debug1("Error: found no hostnames but not the marker for \"no hostnames found\" (pattern error?)")
-    end
-    return nil
-  end
-  output_tab.hosts = hosts_log
-  local hostnames_str = table.concat(hostnames, "\n")
-
-  local filename_prefix = stdnse.get_script_args("hostmap-bfk.prefix")
-  if filename_prefix then
-    local filename = filename_prefix .. stringaux.filename_escape(host.targetname or host.ip)
-    local status, err = write_file(filename, hostnames_str .. "\n")
-    if status then
-      output_tab.filename = filename
-    else
-      stdnse.debug1("Error saving to %s: %s\n", filename, err)
-    end
-  end
-
-  return output_tab
-end
-
-function write_file(filename, contents)
-  local f, err = io.open(filename, "w")
-  if not f then
-    return f, err
-  end
-  f:write(contents)
-  f:close()
-  return true
-end
diff --git a/scripts/script.db b/scripts/script.db
index 4d750cfbc..b5517c18b 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -150,7 +150,6 @@ Entry { filename = "hbase-master-info.nse", categories = { "default", "discovery
 Entry { filename = "hbase-region-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "hddtemp-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "hnap-info.nse", categories = { "default", "discovery", "safe", "version", } }
-Entry { filename = "hostmap-bfk.nse", categories = { "discovery", "external", } }
 Entry { filename = "hostmap-crtsh.nse", categories = { "discovery", "external", } }
 Entry { filename = "hostmap-robtex.nse", categories = { "discovery", "external", "safe", } }
 Entry { filename = "http-adobe-coldfusion-apsa1301.nse", categories = { "exploit", "vuln", } }