diff --git a/lib/msf/core/module.rb b/lib/msf/core/module.rb
index 019fdd04f2..ca206d713d 100644
--- a/lib/msf/core/module.rb
+++ b/lib/msf/core/module.rb
@@ -720,6 +720,8 @@ class Module
 							match = [t,w] if refs.any? { |ref| ref =~ /^bid\-/i and ref =~ r }
 						when 'osvdb'
 							match = [t,w] if refs.any? { |ref| ref =~ /^osvdb\-/i and ref =~ r }
+						when 'edb'
+							match = [t,w] if refs.any? { |ref| ref =~ /^edb\-/i and ref =~ r }
 					end
 					break if match
 				end
diff --git a/lib/msf/core/module/reference.rb b/lib/msf/core/module/reference.rb
index 32293a77ae..2bccb0d0aa 100644
--- a/lib/msf/core/module/reference.rb
+++ b/lib/msf/core/module/reference.rb
@@ -101,6 +101,8 @@ class Msf::Module::SiteReference < Msf::Module::Reference
 			self.site = 'http://www.microsoft.com/technet/security/bulletin/' + in_ctx_val.to_s + '.mspx'
 		elsif (in_ctx_id == 'MIL')
 			self.site = 'http://milw0rm.com/metasploit/' + in_ctx_val.to_s
+		elsif (in_ctx_id == 'EDB')
+			self.site = 'http://www.exploit-db.com/' + in_ctx_val.to_s
 		elsif (in_ctx_id == 'WVE')
 			self.site = 'http://www.wirelessve.org/entries/show/WVE-' + in_ctx_val.to_s
 		elsif (in_ctx_id == 'US-CERT-VU')
diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
index bc0bf9f1a6..61d02b276f 100644
--- a/lib/msf/ui/console/command_dispatcher/core.rb
+++ b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -1304,6 +1304,7 @@ class Core
 			"cve"      => "Modules with a matching CVE ID",
 			"bid"      => "Modules with a matching Bugtraq ID",
 			"osvdb"    => "Modules with a matching OSVDB ID"
+			"edb"      => "Modules with a matching Exploit-DB ID"
 		}.each_pair do |keyword, description|
 			print_line "  #{keyword.ljust 10}:  #{description}"
 		end