diff --git a/CHANGELOG b/CHANGELOG
index c7b704544..a8e95a097 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Added the script metasploit-xmlrpc-brute that performs password
+  auditing against the Metasploit XMLRPC service. [Vlatko Kosturjak]
+
 o [NSE] Added the script openvas-otp-brute that performs password auditing
   against the OpenVas service. [Vlatko Kosturjak]
 
diff --git a/scripts/metasploit-xmlrpc-brute.nse b/scripts/metasploit-xmlrpc-brute.nse
new file mode 100644
index 000000000..9f456be93
--- /dev/null
+++ b/scripts/metasploit-xmlrpc-brute.nse
@@ -0,0 +1,95 @@
+description=[[
+Performs brute force password auditing against a Metasploit RPC server using the XMLRPC protocol.
+]]
+
+---
+-- @usage
+-- nmap --script metasploit-xmlrpc-brute -p 55553 <host>
+--
+-- @output
+-- PORT      STATE SERVICE
+-- 55553/tcp open  unknown
+-- | metasploit-xmlrpc-brute: 
+-- |   Accounts
+-- |     password - Valid credentials
+-- |   Statistics
+-- |_    Performed 243 guesses in 2 seconds, average tps: 121
+--
+
+author = "Vlatko Kosturjak"
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
+categories = {"intrusive", "brute"}
+
+require "shortport"
+require "brute"
+require "comm"
+require "stdnse"
+stdnse.silent_require 'openssl'
+
+portrule = shortport.port_or_service(55553, "metasploit-xmlrpc", "tcp")
+
+Driver = 
+{
+	new = function (self, host, port, opts)
+		local o = { host = host, port = port, opts = opts }
+		setmetatable (o,self)
+		self.__index = self
+		return o
+	end,
+
+	connect = function ( self )
+		self.socket = nmap.new_socket()
+		if ( not(self.socket:connect(self.host, self.port, self.opts)) ) then
+			return false
+		end
+		return true	
+	end,
+
+	login = function( self, username, password )
+		local xmlreq='<?xml version="1.0" ?><methodCall><methodName>auth.login</methodName><params><param><value><string>msf</string></value></param><param><value><string>'..password.."</string></value></param></params></methodCall>\n"..string.char(0)
+		local status, err = self.socket:send(xmlreq)
+
+		if ( not ( status ) ) then
+			local err = brute.Error:new( "Unable to send handshake" )
+			err:setAbort(true)
+			return false, err
+		end
+
+		-- Create a buffer and receive the first line
+		local response 
+		status, response = self.socket:receive_buf("\r?\n", false)
+
+		if (response == nil or string.match(response,"<name>faultString</name><value><string>authentication error</string>")) then
+			stdnse.print_debug(2, "metasploit-xmlrpc-brute: Bad login: %s/%s", username, password)
+			return false, brute.Error:new( "Bad login" )
+		elseif (string.match(response,"<name>result</name><value><string>success</string></value>")) then
+				
+			stdnse.print_debug(1, "metasploit-xmlrpc-brute: Good login: %s/%s", username, password)
+			return true, brute.Account:new(username, password, creds.State.VALID)
+		end
+		stdnse.print_debug(1, "metasploit-xmlrpc-brute: WARNING: Unhandled response: %s", response)
+		return false, brute.Error:new( "unhandled response" )
+	end,
+
+	disconnect = function( self )
+		self.socket:close()
+	end,
+}
+
+action = function(host, port)
+
+	-- first determine whether we need SSL or not
+	local xmlreq='<?xml version="1.0" ?><methodCall><methodName>core.version</methodName></methodCall>\n'..string.char(0)
+	local socket, _, opts = comm.tryssl(host, port, xmlreq, { recv_first = false } )
+	if ( not(socket) ) then
+		return "\n  ERROR: Failed to determine whether SSL was needed or not"
+	end
+
+	local engine = brute.Engine:new(Driver, host, port, opts)
+	engine.options.script_name = SCRIPT_NAME
+	engine.options.firstonly = true
+	engine.options.passonly = true
+	status, result = engine:start()
+	return result
+end
+
diff --git a/scripts/script.db b/scripts/script.db
index a729b20dd..ea0f3abd6 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -147,6 +147,7 @@ Entry { filename = "ldap-rootdse.nse", categories = { "discovery", "safe", } }
 Entry { filename = "ldap-search.nse", categories = { "discovery", "safe", } }
 Entry { filename = "lexmark-config.nse", categories = { "discovery", "safe", } }
 Entry { filename = "lltd-discovery.nse", categories = { "broadcast", "discovery", "safe", } }
+Entry { filename = "metasploit-xmlrpc-brute.nse", categories = { "brute", "intrusive", } }
 Entry { filename = "modbus-discover.nse", categories = { "discovery", "intrusive", } }
 Entry { filename = "mongodb-databases.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "mongodb-info.nse", categories = { "default", "discovery", "safe", } }