diff --git a/modules/auxiliary/analyze/jtr_mssql_fast.rb b/modules/auxiliary/analyze/jtr_mssql_fast.rb
new file mode 100644
index 0000000000..78b1618278
--- /dev/null
+++ b/modules/auxiliary/analyze/jtr_mssql_fast.rb
@@ -0,0 +1,134 @@
+##
+# 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/framework/
+#
+##
+
+
+require 'msf/core'
+
+class Metasploit3 < Msf::Auxiliary
+
+	include Msf::Auxiliary::JohnTheRipper
+
+	def initialize
+		super(
+			'Name'				=> 'John the Ripper MS SQL Password Cracker (Fast Mode)',
+			'Version'           => '$$',
+			'Description'       => %Q{
+					This module uses John the Ripper to identify weak passwords that have been
+				acquired from the mssql_hashdump module. Passwords that have been successfully
+				cracked are then saved as propper credentials
+			},
+			'Author'			=> ['TheLightCosine <thelightcosine[at]gmail.com>',
+									'hdm'
+									] ,
+			'License'			=> MSF_LICENSE  # JtR itself is GPLv2, but this wrapper is MSF (BSD)
+		)
+	end
+
+	def run
+		@wordlist = Rex::Quickfile.new("jtrtmp")
+		
+		@wordlist.write( build_seed().flatten.uniq.join("\n") + "\n" )	
+		@wordlist.close
+		print_status("Cracking MSSQL Hashes")
+		crack("mssql")
+		print_status("Cracking MSSQL05 Hashes")
+		crack("mssql05")
+
+			
+				
+			
+	end
+	
+	def build_seed
+	
+		seed = [] 
+		#Seed the wordlist with Database , Table, and Instance Names
+		schemas = myworkspace.notes.find(:all, :conditions => ['ntype like ?', '%.schema%'])
+		unless schemas.nil? or schemas.empty?
+			schemas.each do |anote|
+				anote.data.each do |key,value|
+					seed << key
+					value.each{|a| seed << a}
+				end
+			end
+		end
+	
+		instances = myworkspace.notes.find(:all, :conditions => ['ntype=?', 'mssql.instancename'])
+		unless instances.nil? or instances.empty?
+			instances.each do |anote|
+				seed << anote.data['InstanceName']
+			end
+		end
+			
+		# Seed the wordlist with usernames, passwords, and hostnames
+		
+
+		myworkspace.hosts.find(:all).each {|o| seed << john_expand_word( o.name ) if o.name }
+		myworkspace.creds.each do |o| 
+			seed << john_expand_word( o.user ) if o.user
+			seed << john_expand_word( o.pass ) if (o.pass and o.ptype !~ /hash/)
+		end
+		
+		# Grab any known passwords out of the john.pot file
+		john_cracked_passwords.values {|v| seed << v }
+
+		#Grab the default John Wordlist
+		john = File.open(john_wordlist_path, "r")
+		john.each_line{|line| seed << line.chomp}
+
+		return seed
+	
+	end
+	
+	
+	def crack(format)
+		
+		hashlist = Rex::Quickfile.new("jtrtmp")
+		ltype= "#{format}.hashes"
+		myloots = myworkspace.loots.find(:all, :conditions => ['ltype=?', ltype])
+		unless myloots.nil? or myloots.empty?
+			myloots.each do |myloot|
+				begin
+					mssql_array = CSV.read(myloot.path).drop(1)
+				rescue Exception => e
+					print_error("Unable to read #{myloot.path} \n #{e}")
+				end
+				mssql_array.each do |row|
+					hashlist.write("#{row[0]}:0x#{row[1]}:#{myloot.host.address}:#{myloot.service.port}\n")
+				end
+			end
+			hashlist.close
+			
+			print_status("HashList: #{hashlist.path}")
+			print_status("Trying Wordlist: #{@wordlist.path}")
+			john_crack(hashlist.path, :wordlist => @wordlist.path, :rules => 'single', :format => format)
+			
+			print_status("Trying Rule: All4...")
+			john_crack(hashlist.path, :incremental => "All4", :format => format)
+			
+			print_status("Trying Rule: Digits5...")
+			john_crack(hashlist.path, :incremental => "Digits5", :format => format)
+			
+			cracked = john_show_passwords(hashlist.path, format)
+			
+			print_status("#{cracked[:cracked]} hashes were cracked!")	
+			cracked[:users].each_pair do |k,v|	
+				print_good("Host: #{v[1]} Port: #{v[2]} User: #{k} Pass: #{v[0]}")
+				report_auth_info(
+					:host  => v[1],
+					:port => v[2],
+					:sname => 'mssql',
+					:user => k,
+					:pass => v[0]
+				)	
+			end
+		end
+	end
+	
+end
+