diff --git a/CHANGELOG b/CHANGELOG
index aa0573125..2037e3ea8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,9 @@ o Fix a couple bugs in the way the Nmap built system checked for an
   configure option for specifying your own liblua. [Daniel
   Roethlisberger]
 
+o Removed mswindowsShell.nse as there is a version detection NULL probe
+  match which accomplishes the same thing. [Brandon, Fyodor, Kris]
+
 Nmap 4.62 [5/3/08]
 
 o Added a new --min-rate option that allows specifying a minimum rate
diff --git a/scripts/mswindowsShell.nse b/scripts/mswindowsShell.nse
deleted file mode 100644
index f925aac5f..000000000
--- a/scripts/mswindowsShell.nse
+++ /dev/null
@@ -1,32 +0,0 @@
-id = "MS Windows shell"
-
-description = "If port 8888 is open and it echos a specific string then we\
-might have found an open MSWindows shell."
-
-author = "Diman Todorov <diman.todorov@gmail.com>"
-
-license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-
-categories = {"backdoor"}
-
-require "shortport"
-
-portrule = shortport.port_or_service(8888, "auth")
-
-action = function(host, port)
-	local status = 0
-	local result = ""
-
-	local client_ident = nmap.new_socket()
-
-	client_ident:connect(host.ip, port.number)
-
-	status, result = client_ident:receive_bytes(4096)
-
-	client_ident:close()
-
-	if string.match(result, "Microsoft Windows") then
-		return "Possible open windows shell found."
-	end
-end
-