diff --git a/lib/msf/core/exploit/browser_autopwn.rb b/lib/msf/core/exploit/browser_autopwn.rb
new file mode 100644
index 0000000000..3366e8d688
--- /dev/null
+++ b/lib/msf/core/exploit/browser_autopwn.rb
@@ -0,0 +1,47 @@
+##
+# $Id$
+##
+
+##
+# This file is part of the Metasploit Framework and may be subject to 
+# redistribution and commercial restrictions. Please see the Metasploit
+# Framework web site for more information on licensing and terms of use.
+# http://metasploit.com/projects/Framework/
+##
+
+require 'msf/core/auxiliary'
+
+module Msf
+module Exploit::Remote::BrowserAutopwn
+
+	include Msf::Auxiliary::Report
+	
+	# this is the magic
+	def self.included(base)
+		base.extend(Autopwn)
+	end
+
+	module Autopwn
+		def autopwn_opts
+			@autopwn_opts.dup
+		end
+		def autopwn_info(opts={})
+			# prefix_html and postfix_html are only used for noscript exploits
+			# vuln_test is only used for javascript exploits
+			@autopwn_opts = {}
+			@autopwn_opts[:ua_name]      = opts[:ua_name] || nil
+			@autopwn_opts[:ua_ver]       = opts[:ua_ver]  || opts[:ua_version] || nil
+			@autopwn_opts[:classid]      = opts[:classid] || opts[:clsid] || nil
+			@autopwn_opts[:javascript]   = (opts[:javascript].nil?) ? true : opts[:javascript]
+			@autopwn_opts[:os_name]      = opts[:os_name] || nil
+			@autopwn_opts[:os_ver]       = opts[:os_ver]  || opts[:os_version] || nil
+			@autopwn_opts[:postfix_html] = opts[:postfix_html] || nil
+			@autopwn_opts[:prefix_html]  = opts[:prefix_html]  || nil
+			@autopwn_opts[:rank]         = opts[:rank] || NormalRanking
+			@autopwn_opts[:vuln_test]    = opts[:vuln_test] || opts[:vulntest] || nil
+		end
+	end
+
+end
+end
+