diff --git a/data/wmap/wmap_404s.txt b/data/wmap/wmap_404s.txt
index 1ea510a92e..a294f95f6c 100644
--- a/data/wmap/wmap_404s.txt
+++ b/data/wmap/wmap_404s.txt
@@ -9,9 +9,11 @@ ExtendNet
 FAIL
 FireWall-1 message
 HP Web JetAdmin
+gina de error
 IMail Server Web Messaging
 Management Console
 No web site is configured at this address
+NO ENCONTRADA
 PHP Fatal error:  Unable to open
 Please identify yourself:
 RSA SecurID User Name Request
diff --git a/data/wmap/wmap_dirs.txt b/data/wmap/wmap_dirs.txt
index 7bdfa0fc65..d9eafc3933 100644
--- a/data/wmap/wmap_dirs.txt
+++ b/data/wmap/wmap_dirs.txt
@@ -311,6 +311,7 @@ employees
 empoyees
 empris
 engine
+enter
 envia
 enviamail
 error
diff --git a/lib/msf/core/module/author.rb b/lib/msf/core/module/author.rb
index 309df80e20..2bdb227fb0 100644
--- a/lib/msf/core/module/author.rb
+++ b/lib/msf/core/module/author.rb
@@ -27,7 +27,8 @@ class Msf::Module::Author
 			'I)ruid'    => 'druid' +  0x40.chr + 'caughq.org',
 			'egypt'     => 'egypt' + 0x40.chr + 'metasploit.com',
 			'kris katterjohn' => 'katterjohn' + 0x40.chr + 'gmail.com',
-			'CG'        => 'cg' + 0x40.chr + 'carnal0wnage.com'
+			'CG'        => 'cg' + 0x40.chr + 'carnal0wnage.com',
+			'et'        => 'et' + 0x40.chr + 'metasploit.com'
 		}
 
 	#
diff --git a/modules/auxiliary/scanner/http/wmap_dir_scanner.rb b/modules/auxiliary/scanner/http/wmap_dir_scanner.rb
index 5f70307fc3..9740a80079 100644
--- a/modules/auxiliary/scanner/http/wmap_dir_scanner.rb
+++ b/modules/auxiliary/scanner/http/wmap_dir_scanner.rb
@@ -118,9 +118,9 @@ class Metasploit3 < Msf::Auxiliary
 
 				
 				if(not res or ((res.code.to_i == ecode) or (emesg and res.body.index(emesg))))
-					print_status("NOT Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{target_host})") 					
+					print_status("NOT Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{wmap_target_host})") 					
 				else
-					print_status("Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{target_host})")
+					print_status("Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{wmap_target_host})")
 					rep_id = wmap_base_report_id(
 									wmap_target_host,
 									wmap_target_port,