diff --git a/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb b/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
index 4786829140..ca07d8e1c8 100644
--- a/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
+++ b/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'OSVDB', '73447' ],
 					[ 'CVE', '2008-2938' ],
 					[ 'URL', 'http://www.securityfocus.com/archive/1/499926' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17388' ],
+					[ 'EDB', 17388 ],
 					[ 'BID', '48225' ],
 				],
 			'Author'      => [ 'patrick' ],
diff --git a/modules/auxiliary/admin/http/typo3_sa_2009_002.rb b/modules/auxiliary/admin/http/typo3_sa_2009_002.rb
index 9e91b247c5..a46037a090 100644
--- a/modules/auxiliary/admin/http/typo3_sa_2009_002.rb
+++ b/modules/auxiliary/admin/http/typo3_sa_2009_002.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Auxiliary
 					['OSVDB', '52048'],
 					['CVE', '2009-0815'],
 					['URL', 'http://secunia.com/advisories/33829/'],
-					['URL', 'http://www.exploit-db.com/exploits/8038/'],
+					['EDB', 8038],
 					['URL', 'http://typo3.org/teams/security/security-bulletins/typo3-sa-2009-002/'],
 				],
 			'DisclosureDate' => 'Feb 10 2009',
diff --git a/modules/auxiliary/admin/zend/java_bridge.rb b/modules/auxiliary/admin/zend/java_bridge.rb
index a481667079..bd76b2bd23 100644
--- a/modules/auxiliary/admin/zend/java_bridge.rb
+++ b/modules/auxiliary/admin/zend/java_bridge.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					[ 'OSVDB', '71420'],
 					[ 'URL', 'http://www.zerodayinitiative.com/advisories/ZDI-11-113/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17078/' ],
+					[ 'EDB', 17078 ],
 				],
 			'DisclosureDate' => 'Mar 28 2011'))
 
diff --git a/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb b/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb
index 33bad3424d..eb69d61ae7 100644
--- a/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb
+++ b/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					[ 'CVE', '2010-2156' ],
 					[ 'OSVDB', '65246'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14185/']
+					[ 'EDB', 14185]
 				]
 		)
 		register_options(
diff --git a/modules/auxiliary/dos/hp/data_protector_rds.rb b/modules/auxiliary/dos/hp/data_protector_rds.rb
index 3f3aeca7c2..0e13d4d2ed 100644
--- a/modules/auxiliary/dos/hp/data_protector_rds.rb
+++ b/modules/auxiliary/dos/hp/data_protector_rds.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					[ 'CVE', '2011-0514' ],
 					[ 'OSVDB', '70617' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15940/' ],
+					[ 'EDB', 15940 ],
 				],
 			'DisclosureDate' => 'Jan 8 2011' ))
 
diff --git a/modules/auxiliary/dos/http/apache_mod_isapi.rb b/modules/auxiliary/dos/http/apache_mod_isapi.rb
index e5ba8180fd..a5a0504938 100644
--- a/modules/auxiliary/dos/http/apache_mod_isapi.rb
+++ b/modules/auxiliary/dos/http/apache_mod_isapi.rb
@@ -53,7 +53,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'URL', 'https://issues.apache.org/bugzilla/show_bug.cgi?id=48509' ],
 					[ 'URL', 'http://www.gossamer-threads.com/lists/apache/cvs/381537' ],
 					[ 'URL', 'http://www.senseofsecurity.com.au/advisories/SOS-10-002' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11650' ]
+					[ 'EDB', 11650 ]
 				],
 			'DisclosureDate' => 'Mar 05 2010'))
 
diff --git a/modules/auxiliary/dos/http/apache_range_dos.rb b/modules/auxiliary/dos/http/apache_range_dos.rb
index 6eeec3326e..cc4f1f6932 100644
--- a/modules/auxiliary/dos/http/apache_range_dos.rb
+++ b/modules/auxiliary/dos/http/apache_range_dos.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					[ 'BID', '49303'],
 					[ 'CVE', '2011-3192'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17696/'],
+					[ 'EDB', 17696],
 					[ 'OSVDB', '74721' ],
 				],
 			'DisclosureDate' => 'Aug 19 2011'))
diff --git a/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb b/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb
index 0a8f635f4e..3365bd54ef 100644
--- a/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb
+++ b/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'OSVDB', '70167' ],
 					[ 'BID', '45542' ],
 					[ 'MSB', 'MS11-004' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15803/' ],
+					[ 'EDB', 15803 ],
 					[ 'URL', 'http://blogs.technet.com/b/srd/archive/2010/12/22/assessing-an-iis-ftp-7-5-unauthenticated-denial-of-service-vulnerability.aspx' ]
 				],
 			'Platform'       => [ 'win' ],
diff --git a/modules/auxiliary/dos/windows/ftp/solarftp_user.rb b/modules/auxiliary/dos/windows/ftp/solarftp_user.rb
index f0fa0f81e9..ebb04b1c32 100644
--- a/modules/auxiliary/dos/windows/ftp/solarftp_user.rb
+++ b/modules/auxiliary/dos/windows/ftp/solarftp_user.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Auxiliary
 			'Version'        => '$Revision$',
 			'References'     =>
 			[
-				[ 'URL', 'http://www.exploit-db.com/exploits/16204/' ],
+				[ 'EDB', 16204 ],
 			],
 			'DisclosureDate' => 'Feb 22 2011'))
 
diff --git a/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb b/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb
index 2f56d14613..be3b103eb3 100644
--- a/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb
+++ b/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'CVE', '2010-1899' ],
 					[ 'OSVDB', '67978'],
 					[ 'MSB', 'MS10-065'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15167/' ]
+					[ 'EDB', 15167 ]
 				],
 			'DisclosureDate' => 'Sep 14 2010'))
 
diff --git a/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb b/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb
index 7e8271d07c..bbd0a503ee 100644
--- a/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb
+++ b/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'URL', 'http://pastie.org/private/4egcqt9nucxnsiksudy5dw' ],
 					[ 'URL', 'http://pastie.org/private/feg8du0e9kfagng4rrg' ],
 					[ 'URL', 'http://stratsec.blogspot.com.au/2012/03/ms12-020-vulnerability-for-breakfast.html' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/18606/' ]
+					[ 'EDB', 18606 ]
 				],
 			'Author'         =>
 				[
diff --git a/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb b/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb
index 117459beef..1bcf816500 100644
--- a/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb
+++ b/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb
@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'BID', '46360' ],
 					[ 'OSVDB', '70881' ],
 					[ 'MSB', 'MS11-019' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/16166/' ],
+					[ 'EDB', 16166 ],
 					[ 'URL', 'http://seclists.org/fulldisclosure/2011/Feb/285' ]
 				],
 			'Author'         => [ 'Cupidon-3005', 'jduck' ],
diff --git a/modules/auxiliary/dos/windows/tftp/solarwinds.rb b/modules/auxiliary/dos/windows/tftp/solarwinds.rb
index 9a3ec4c0ea..7d7c48d41a 100644
--- a/modules/auxiliary/dos/windows/tftp/solarwinds.rb
+++ b/modules/auxiliary/dos/windows/tftp/solarwinds.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					[ 'CVE', '2010-2115' ],
 					[ 'OSVDB', '64845' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12683' ]
+					[ 'EDB', 12683 ]
 				],
 			'DisclosureDate' => 'May 21 2010'))
 
diff --git a/modules/auxiliary/scanner/http/axis_local_file_include.rb b/modules/auxiliary/scanner/http/axis_local_file_include.rb
index f0d4bddee0..e50c611ce8 100644
--- a/modules/auxiliary/scanner/http/axis_local_file_include.rb
+++ b/modules/auxiliary/scanner/http/axis_local_file_include.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Auxiliary
 			},
 			'References'     =>
 				[
-					['URL', 'http://www.exploit-db.com/exploits/12721/'],
+					['EDB', 12721],
 					['OSVDB', '59001'],
 				],
 			'Author'         =>
diff --git a/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb b/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb
index 7a7f7fef2f..7e6743a071 100644
--- a/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb
+++ b/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					['OSVDB', '68301'],
 					['URL', 'http://secunia.com/advisories/41609/'],
-					['URL', 'http://www.exploit-db.com/exploits/15130/']
+					['EDB', 15130]
 				],
 			'Author'         =>
 				[
diff --git a/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb b/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb
index aca0258d30..b4602294c6 100644
--- a/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb
+++ b/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'CVE', '2010-2333' ],
 					[ 'OSVDB', '65476' ],
 					[ 'BID', '40815' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/13850/' ]
+					[ 'EDB', 13850 ]
 				],
 			'Author'         =>
 				[
diff --git a/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb b/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb
index 5c6fab24e2..011ddae479 100644
--- a/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb
+++ b/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Auxiliary
 					['CVE', '2011-0063'],
 					['URL', 'https://sitewat.ch/en/Advisory/View/1'],
 					['URL', 'http://sotiriu.de/adv/NSOADV-2011-003.txt'],
-					['URL', 'http://www.exploit-db.com/exploits/16103/']
+					['EDB', 16103]
 				],
 			'DisclosureDate' => 'Mar 08 2011',
 			'License'        =>  MSF_LICENSE
diff --git a/modules/auxiliary/scanner/http/nginx_source_disclosure.rb b/modules/auxiliary/scanner/http/nginx_source_disclosure.rb
index 719752a135..e2aafe2f1e 100644
--- a/modules/auxiliary/scanner/http/nginx_source_disclosure.rb
+++ b/modules/auxiliary/scanner/http/nginx_source_disclosure.rb
@@ -31,8 +31,8 @@ class Metasploit3 < Msf::Auxiliary
 					[ 'CVE', '2010-2263' ],
 					[ 'OSVDB', '65531' ],
 					[ 'BID', '40760' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/13818/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/13822/' ]
+					[ 'EDB', 13818 ],
+					[ 'EDB', 13822 ]
 				],
 			'Author'         =>
 				[
diff --git a/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb b/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb
index 58e802a2b5..bf9f49d80c 100644
--- a/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb
+++ b/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb
@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					['BID', '51182'],
 					['CVE', '2011-4862'],
-					['URL', 'http://www.exploit-db.com/exploits/18280/']
+					['EDB', 18280]
 				]
 		)
 		register_options(
diff --git a/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb b/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb
index d455a65112..0543aeb1c2 100644
--- a/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb
+++ b/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Auxiliary
 				[
 					['OSVDB', '77455'],
 					['BID', '50890'],
-					['URL', 'http://www.exploit-db.com/exploits/18189/'],
+					['EDB', 18189],
 					['URL', 'http://secpod.org/advisories/SecPod_Ipswitch_TFTP_Server_Dir_Trav.txt']
 				],
 			'DisclosureDate' => "Dec 12 2011"
diff --git a/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb b/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
index a702717731..42e6a06a62 100644
--- a/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
+++ b/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['CVE', '2011-4862'],
 					['OSVDB', '78020'],
 					['BID', '51182'],
-					['URL', 'http://www.exploit-db.com/exploits/18280/']
+					['EDB', 18280]
 				],
 			'Privileged'     => true,
 			'Platform'       => 'bsd',
diff --git a/modules/exploits/linux/misc/lprng_format_string.rb b/modules/exploits/linux/misc/lprng_format_string.rb
index 84d79b32a8..edc0914596 100644
--- a/modules/exploits/linux/misc/lprng_format_string.rb
+++ b/modules/exploits/linux/misc/lprng_format_string.rb
@@ -40,9 +40,9 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'US-CERT-VU', '382365' ],
 					[ 'URL', 'http://www.cert.org/advisories/CA-2000-22.html' ],
 					[ 'URL', 'https://bugzilla.redhat.com/show_bug.cgi?id=17756' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/226' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/227' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/230' ]
+					[ 'EDB', 226 ],
+					[ 'EDB', 227 ],
+					[ 'EDB', 230 ]
 				],
 			'Platform'       => 'linux',
 			'Arch'           => ARCH_X86,
diff --git a/modules/exploits/linux/misc/netsupport_manager_agent.rb b/modules/exploits/linux/misc/netsupport_manager_agent.rb
index 8a93cc51ac..9077b858ab 100644
--- a/modules/exploits/linux/misc/netsupport_manager_agent.rb
+++ b/modules/exploits/linux/misc/netsupport_manager_agent.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '70408' ],
 					[ 'BID', '45728' ],
 					[ 'URL', 'http://seclists.org/fulldisclosure/2011/Jan/90' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15937/' ]
+					[ 'EDB', 15937 ]
 				],
 			'Privileged'     => true,
 			'Platform'       => 'linux',
diff --git a/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb b/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
index 9396a126fb..8e1f403124 100644
--- a/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
+++ b/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
@@ -42,8 +42,8 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2006-2502' ],
 					[ 'OSVDB', '25853' ],
 					[ 'BID', '18056' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/2053' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/2185' ],
+					[ 'EDB', 2053 ],
+					[ 'EDB', 2185 ],
 					[ 'URL', 'http://archives.neohapsis.com/archives/fulldisclosure/2006-05/0527.html' ],
 				],
 			'Payload'	=>
diff --git a/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb b/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
index 9c38ef4ff7..3629886e6b 100644
--- a/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
+++ b/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['CVE', '2011-4862'],
 					['OSVDB', '78020'],
 					['BID', '51182'],
-					['URL', 'http://www.exploit-db.com/exploits/18280/']
+					['EDB', 18280]
 				],
 			'Privileged'     => true,
 			'Platform'       => 'linux',
diff --git a/modules/exploits/multi/fileformat/peazip_command_injection.rb b/modules/exploits/multi/fileformat/peazip_command_injection.rb
index 08ba7f7abe..ef5736ea3b 100644
--- a/modules/exploits/multi/fileformat/peazip_command_injection.rb
+++ b/modules/exploits/multi/fileformat/peazip_command_injection.rb
@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2009-2261' ],
 					[ 'OSVDB', '54966' ],
 					[ 'URL', 'http://peazip.sourceforge.net/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/8881' ]
+					[ 'EDB', 8881 ]
 				],
 			'Platform'       => ['unix', 'win', 'linux'],
 			'Arch'           => ARCH_CMD,
diff --git a/modules/exploits/multi/http/familycms_less_exec.rb b/modules/exploits/multi/http/familycms_less_exec.rb
index 3faeab7541..5869c1a3b6 100644
--- a/modules/exploits/multi/http/familycms_less_exec.rb
+++ b/modules/exploits/multi/http/familycms_less_exec.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'URL', 'https://www.familycms.com/blog/2011/11/security-vulnerability-fcms-2-5-2-7-1/' ],
 					[ 'URL', 'http://sourceforge.net/apps/trac/fam-connections/ticket/407' ],
 					[ 'URL', 'http://rwx.biz.nf/advisories/fc_cms_rce_adv.html' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/18198/' ]
+					[ 'EDB', 18198 ]
 				],
 			'Privileged'     => false,
 			'Payload'        =>
diff --git a/modules/exploits/multi/http/phpldapadmin_query_engine.rb b/modules/exploits/multi/http/phpldapadmin_query_engine.rb
index e92d70180d..e185ecc504 100644
--- a/modules/exploits/multi/http/phpldapadmin_query_engine.rb
+++ b/modules/exploits/multi/http/phpldapadmin_query_engine.rb
@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['OSVDB', '76594'],
 					['BID', '50331'],
 					['URL', 'http://sourceforge.net/support/tracker.php?aid=3417184'],
-					['URL', 'http://www.exploit-db.com/exploits/18021/'],
+					['EDB', 18021],
 				],
 			'Privileged'     => false,
 			'Payload'        =>
diff --git a/modules/exploits/multi/http/phpscheduleit_start_date.rb b/modules/exploits/multi/http/phpscheduleit_start_date.rb
index 9ab924050e..1f4f1d105f 100644
--- a/modules/exploits/multi/http/phpscheduleit_start_date.rb
+++ b/modules/exploits/multi/http/phpscheduleit_start_date.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['CVE', '2008-6132'],
 					['OSVDB', '48797'],
 					['BID', '31520'],
-					['URL', 'http://www.exploit-db.com/exploits/6646/'],
+					['EDB', 6646],
 				],
 			'Privileged'     => false,
 			'Platform'       => ['php'],
diff --git a/modules/exploits/multi/http/plone_popen2.rb b/modules/exploits/multi/http/plone_popen2.rb
index 7c95ef28c1..31edd8e8fa 100644
--- a/modules/exploits/multi/http/plone_popen2.rb
+++ b/modules/exploits/multi/http/plone_popen2.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					['CVE', '2011-3587'],
 					['OSVDB', '76105'],
-					['URL', 'http://www.exploit-db.com/exploits/18262/'],
+					['EDB', 18262],
 					['URL', 'http://plone.org/products/plone/security/advisories/20110928']
 				],
 			'Privileged'     => false,
diff --git a/modules/exploits/multi/http/pmwiki_pagelist.rb b/modules/exploits/multi/http/pmwiki_pagelist.rb
index 7823fe6641..9da48f9920 100644
--- a/modules/exploits/multi/http/pmwiki_pagelist.rb
+++ b/modules/exploits/multi/http/pmwiki_pagelist.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['CVE', '2011-4453'],
 					['BID', '50776'],
 					['OSVDB', '77261'],
-					['URL', 'http://www.exploit-db.com/exploits/18149/'],
+					['EDB', 18149],
 					['URL', 'http://www.pmwiki.org/wiki/PITS/01271']
 				],
 			'Privileged'     => false,
diff --git a/modules/exploits/multi/http/struts_code_exec.rb b/modules/exploits/multi/http/struts_code_exec.rb
index 511635c575..27e451eef1 100644
--- a/modules/exploits/multi/http/struts_code_exec.rb
+++ b/modules/exploits/multi/http/struts_code_exec.rb
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2010-1870'],
 					[ 'OSVDB', '66280'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14360/' ],
+					[ 'EDB', 14360 ],
 				],
 			'Platform'      => [ 'win', 'linux'],
 			'Privileged'     => true,
diff --git a/modules/exploits/multi/http/traq_plugin_exec.rb b/modules/exploits/multi/http/traq_plugin_exec.rb
index c04710e9c7..a703d6372f 100644
--- a/modules/exploits/multi/http/traq_plugin_exec.rb
+++ b/modules/exploits/multi/http/traq_plugin_exec.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '77556'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/18213/' ],
+					[ 'EDB', 18213 ],
 					[ 'URL', 'http://traqproject.org/' ],
 				],
 			'Privileged'     => false,
diff --git a/modules/exploits/multi/http/vbseo_proc_deutf.rb b/modules/exploits/multi/http/vbseo_proc_deutf.rb
index 6b56f23f29..fb07b917e9 100644
--- a/modules/exploits/multi/http/vbseo_proc_deutf.rb
+++ b/modules/exploits/multi/http/vbseo_proc_deutf.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['OSVDB', '78508'],
 					['BID', '51647'],
 					['URL', 'http://www.vbseo.com/f5/vbseo-security-bulletin-all-supported-versions-patch-release-52783/'],
-					['URL', 'http://www.exploit-db.com/exploits/18424/']
+					['EDB', 18424]
 				],
 			'Privileged'     => false,
 			'Payload'        =>
diff --git a/modules/exploits/multi/misc/zend_java_bridge.rb b/modules/exploits/multi/misc/zend_java_bridge.rb
index 6bd703efa5..759eeb5fdf 100644
--- a/modules/exploits/multi/misc/zend_java_bridge.rb
+++ b/modules/exploits/multi/misc/zend_java_bridge.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'OSVDB', '71420'],
 					[ 'URL', 'http://www.zerodayinitiative.com/advisories/ZDI-11-113/'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17078/' ],
+					[ 'EDB', 17078 ],
 				],
 			'Platform'       => ['java'], # win
 			'Arch'           => ARCH_JAVA,
diff --git a/modules/exploits/osx/http/evocam_webserver.rb b/modules/exploits/osx/http/evocam_webserver.rb
index 82fad09931..e24abf3122 100644
--- a/modules/exploits/osx/http/evocam_webserver.rb
+++ b/modules/exploits/osx/http/evocam_webserver.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					['CVE', '2010-2309'],
 					['OSVDB', '65043'],
-					['URL', 'http://www.exploit-db.com/exploits/12835'],
+					['EDB', 12835],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/osx/misc/ufo_ai.rb b/modules/exploits/osx/misc/ufo_ai.rb
index 06a49eceb8..ebfaf6698c 100644
--- a/modules/exploits/osx/misc/ufo_ai.rb
+++ b/modules/exploits/osx/misc/ufo_ai.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References' =>
 				[
 					[ 'OSVDB', '65689' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14013' ]
+					[ 'EDB', 14013 ]
 				],
 			'Payload' =>
 				{
diff --git a/modules/exploits/unix/webapp/awstats_migrate_exec.rb b/modules/exploits/unix/webapp/awstats_migrate_exec.rb
index fbcd161369..75a7dc6c1c 100644
--- a/modules/exploits/unix/webapp/awstats_migrate_exec.rb
+++ b/modules/exploits/unix/webapp/awstats_migrate_exec.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['OSVDB', '25284'],
 					['BID', '17844'],
 					['URL', 'http://awstats.sourceforge.net/awstats_security_news.php'],
-					['URL', 'http://www.exploit-db.com/exploits/1755/'],
+					['EDB', 1755],
 				],
 			'Privileged'     => false,
 			'Payload'        =>
diff --git a/modules/exploits/unix/webapp/coppermine_piceditor.rb b/modules/exploits/unix/webapp/coppermine_piceditor.rb
index 8f98d8ee6a..27c7f7bb7c 100644
--- a/modules/exploits/unix/webapp/coppermine_piceditor.rb
+++ b/modules/exploits/unix/webapp/coppermine_piceditor.rb
@@ -52,7 +52,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2008-0506' ],
 					[ 'OSVDB', '41676' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/5019' ],
+					[ 'EDB', 5019 ],
 					[ 'URL', 'http://forum.coppermine-gallery.net/index.php?topic=50103.0' ]
 				],
 			'Privileged'     => true, # web server context
diff --git a/modules/exploits/unix/webapp/joomla_tinybrowser.rb b/modules/exploits/unix/webapp/joomla_tinybrowser.rb
index 14f1d47120..68efafa3ec 100644
--- a/modules/exploits/unix/webapp/joomla_tinybrowser.rb
+++ b/modules/exploits/unix/webapp/joomla_tinybrowser.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					['OSVDB', '64578'],
-					['URL', 'http://www.exploit-db.com/exploits/9296/'],
+					['EDB', 9296],
 					['URL', 'http://developer.joomla.org/security/news/301-20090722-core-file-upload.html'],
 				],
 			'Privileged'     => false,
diff --git a/modules/exploits/unix/webapp/sphpblog_file_upload.rb b/modules/exploits/unix/webapp/sphpblog_file_upload.rb
index 8b71279c99..a8849aa592 100644
--- a/modules/exploits/unix/webapp/sphpblog_file_upload.rb
+++ b/modules/exploits/unix/webapp/sphpblog_file_upload.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['CVE', '2005-2733'],
 					['OSVDB', '19012'],
 					['BID', '14667'],
-					['URL', 'http://www.exploit-db.com/exploits/1191/'],
+					['EDB', 1191],
 				],
 			'Privileged'     => false,
 			'Payload'        =>
diff --git a/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb b/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
index aa5ee30480..679cccfef0 100644
--- a/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
+++ b/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2009-1612' ],
 					[ 'OSVDB', '54169' ],
 					[ 'BID', '34789' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/8579' ]
+					[ 'EDB', 8579 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb b/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
index bfcda8eaae..605b1296eb 100644
--- a/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
+++ b/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
@@ -51,7 +51,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2008-2683'],
 					[ 'OSVDB', '46007'],
 					[ 'BID', '29577'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/5750/' ],
+					[ 'EDB', 5750 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/chilkat_crypt_writefile.rb b/modules/exploits/windows/browser/chilkat_crypt_writefile.rb
index 1b3ba61e65..44dd145129 100644
--- a/modules/exploits/windows/browser/chilkat_crypt_writefile.rb
+++ b/modules/exploits/windows/browser/chilkat_crypt_writefile.rb
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2008-5002' ],
 					[ 'OSVDB', '49510' ],
 					[ 'BID', '32073' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/6963' ]
+					[ 'EDB', 6963 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/browser/communicrypt_mail_activex.rb b/modules/exploits/windows/browser/communicrypt_mail_activex.rb
index f232461205..d7a04dd363 100644
--- a/modules/exploits/windows/browser/communicrypt_mail_activex.rb
+++ b/modules/exploits/windows/browser/communicrypt_mail_activex.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '64839' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12663' ],
+					[ 'EDB', 12663 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/dxstudio_player_exec.rb b/modules/exploits/windows/browser/dxstudio_player_exec.rb
index 1541b9ceba..632594c597 100644
--- a/modules/exploits/windows/browser/dxstudio_player_exec.rb
+++ b/modules/exploits/windows/browser/dxstudio_player_exec.rb
@@ -44,7 +44,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2009-2011' ],
 					[ 'BID', '35273' ],
 					[ 'OSVDB', '54969' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/8922' ],
+					[ 'EDB', 8922 ],
 					[ 'URL', 'http://dxstudio.com/guide.aspx' ]
 				],
 			'Payload'        =>
diff --git a/modules/exploits/windows/browser/greendam_url.rb b/modules/exploits/windows/browser/greendam_url.rb
index cd78b33f98..18e3a1b0bf 100644
--- a/modules/exploits/windows/browser/greendam_url.rb
+++ b/modules/exploits/windows/browser/greendam_url.rb
@@ -49,7 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					['OSVDB', '55126'],
 					['URL', 'http://www.cse.umich.edu/~jhalderm/pub/gd/'],		# Analysis of the Green Dam Censorware System
-					['URL', 'http://www.exploit-db.com/exploits/8938/'],		# Original exploit by seer[N.N.U]
+					['EDB', 8938],		# Original exploit by seer[N.N.U]
 					['URL', 'http://taossa.com/archive/bh08sotirovdowd.pdf'],	# .NET DLL memory technique
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb b/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
index 9440210223..228f622931 100644
--- a/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
+++ b/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2010-0679' ],
 					[ 'OSVDB', '62276' ],
 					[ 'URL', 'http://www.security-assessment.com/files/advisories/2010-02-11_ChemviewX_Activex.pdf' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11422/' ]
+					[ 'EDB', 11422 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb b/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
index 623f04bd47..73ed6b55f8 100644
--- a/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
+++ b/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision: $',
 			'References'     =>
 				[
-					[ 'URL', 'http://www.exploit-db.com/exploits/15668/' ],
+					[ 'EDB', 15668 ],
 					[ 'URL', 'http://secunia.com/advisories/42445/' ],
 					[ 'URL', 'http://xforce.iss.net/xforce/xfdb/63666' ]
 				],
diff --git a/modules/exploits/windows/browser/ms09_043_owc_msdso.rb b/modules/exploits/windows/browser/ms09_043_owc_msdso.rb
index f4a885da3c..d959f0276d 100644
--- a/modules/exploits/windows/browser/ms09_043_owc_msdso.rb
+++ b/modules/exploits/windows/browser/ms09_043_owc_msdso.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '55806' ],
 					[ 'MSB', 'MS09-043' ],
 					[ 'URL', 'http://ahmed.obied.net/software/code/exploits/ie_owc.py' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9163/' ],
+					[ 'EDB', 9163 ],
 					# broken: [ 'URL', 'http://xeye.us/blog/2009/07/one-0day/' ],
 					[ 'URL', 'http://www.microsoft.com/technet/security/advisory/973472.mspx' ],
 				],
diff --git a/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb b/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
index 4270e1f046..39c846b8d4 100644
--- a/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
+++ b/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
@@ -64,7 +64,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '68987' ],
 					[ 'BID', '44536' ],
 					[ 'URL', 'http://www.microsoft.com/technet/security/advisory/2458511.mspx' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15421/' ],
+					[ 'EDB', 15421 ],
 					[ 'MSB', 'MS10-090' ]
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/browser/novelliprint_callbackurl.rb b/modules/exploits/windows/browser/novelliprint_callbackurl.rb
index cefc553c08..7611cbdfe1 100644
--- a/modules/exploits/windows/browser/novelliprint_callbackurl.rb
+++ b/modules/exploits/windows/browser/novelliprint_callbackurl.rb
@@ -62,7 +62,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2010-1527' ],
 					[ 'OSVDB', '67411'],
 					[ 'URL', 'http://secunia.com/secunia_research/2010-104/' ],	# Carsten Eiram, Secunia Research
-					[ 'URL', 'http://www.exploit-db.com/exploits/15042/' ],		# MOAUB #19
+					[ 'EDB', 15042 ],		# MOAUB #19
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb b/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
index 24ce98a9e5..40ec0b0b13 100644
--- a/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
+++ b/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
@@ -61,7 +61,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2010-3106' ],
 					[ 'OSVDB', '66960'],
 					[ 'URL', 'http://dvlabs.tippingpoint.com/advisory/TPTI-10-06' ],	# Aaron Portnoy, TippingPoint DVLabs
-					[ 'URL', 'http://www.exploit-db.com/exploits/15001/' ],				# MOAUB #14
+					[ 'EDB', 15001 ],				# MOAUB #14
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb b/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
index fbf6a55525..71407aca30 100644
--- a/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
+++ b/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'BID', '44966' ],
 					[ 'OSVDB', '69357' ],
 					[ 'URL', 'http://www.zerodayinitiative.com/advisories/ZDI-10-256/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/16014/' ],
+					[ 'EDB', 16014 ],
 					[ 'URL', 'http://www.novell.com/support/viewContent.do?externalId=7007234' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/browser/real_arcade_installerdlg.rb b/modules/exploits/windows/browser/real_arcade_installerdlg.rb
index 28989b59ec..02b59d313b 100644
--- a/modules/exploits/windows/browser/real_arcade_installerdlg.rb
+++ b/modules/exploits/windows/browser/real_arcade_installerdlg.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '71559' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17105/' ]
+					[ 'EDB', 17105 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/browser/trendmicro_extsetowner.rb b/modules/exploits/windows/browser/trendmicro_extsetowner.rb
index 8d05ba4c29..f019276516 100644
--- a/modules/exploits/windows/browser/trendmicro_extsetowner.rb
+++ b/modules/exploits/windows/browser/trendmicro_extsetowner.rb
@@ -61,7 +61,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2010-3189' ],
 					[ 'OSVDB', '67561'],
 					[ 'URL', 'http://www.zerodayinitiative.com/advisories/ZDI-10-165/' ],	# Andrea Micalizzi aka rgod via Zero Day Initiative
-					[ 'URL', 'http://www.exploit-db.com/exploits/14878/' ],		# MOAUB #03
+					[ 'EDB', 14878 ],		# MOAUB #03
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/ultraoffice_httpupload.rb b/modules/exploits/windows/browser/ultraoffice_httpupload.rb
index 9a8fc92ec6..9689ef0c92 100644
--- a/modules/exploits/windows/browser/ultraoffice_httpupload.rb
+++ b/modules/exploits/windows/browser/ultraoffice_httpupload.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2008-3878' ],
 					[ 'OSVDB', '47866' ],
 					[ 'BID', '30861' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/6318' ]
+					[ 'EDB', 6318 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb b/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
index 10f1eef772..6070ba49dc 100644
--- a/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
+++ b/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2010-0356' ],
 					[ 'OSVDB', '61634' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12320/' ],
+					[ 'EDB', 12320 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/webex_ucf_newobject.rb b/modules/exploits/windows/browser/webex_ucf_newobject.rb
index 12e7db102f..b09bf4a612 100644
--- a/modules/exploits/windows/browser/webex_ucf_newobject.rb
+++ b/modules/exploits/windows/browser/webex_ucf_newobject.rb
@@ -49,7 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2008-3558' ],
 					[ 'OSVDB', '47344' ],
 					[ 'BID', '30578' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/6220' ],
+					[ 'EDB', 6220 ],
 					[ 'URL', 'http://labs.idefense.com/intelligence/vulnerabilities/display.php?id=849' ],
 					[ 'URL', 'http://www.trapkit.de/advisories/TKADV2008-009.txt' ],
 					[ 'URL', 'http://tk-blog.blogspot.com/2008/09/vulnerability-rediscovery-xss-and-webex.html' ],
diff --git a/modules/exploits/windows/fileformat/a-pdf_wav_to_mp3.rb b/modules/exploits/windows/fileformat/a-pdf_wav_to_mp3.rb
index 2e18ce3f10..8129d72d3c 100644
--- a/modules/exploits/windows/fileformat/a-pdf_wav_to_mp3.rb
+++ b/modules/exploits/windows/fileformat/a-pdf_wav_to_mp3.rb
@@ -36,8 +36,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '67241' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14676/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14681/' ]
+					[ 'EDB', 14676 ],
+					[ 'EDB', 14681 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb b/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb
index f846b3a050..fb4006804a 100644
--- a/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb
+++ b/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'BID', '37192' ],
 					[ 'OSVDB', '60632' ],
 					[ 'URL', 'http://retrogod.altervista.org/9sg_adobe_illuso.html' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10281' ],
+					[ 'EDB', 10281 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/aol_desktop_linktag.rb b/modules/exploits/windows/fileformat/aol_desktop_linktag.rb
index 02b06c3581..4adf6f8c8b 100644
--- a/modules/exploits/windows/fileformat/aol_desktop_linktag.rb
+++ b/modules/exploits/windows/fileformat/aol_desktop_linktag.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '70741'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/16085/' ],
+					[ 'EDB', 16085 ],
 				],
 			'Payload'	     =>
 				{
diff --git a/modules/exploits/windows/fileformat/aol_phobos_bof.rb b/modules/exploits/windows/fileformat/aol_phobos_bof.rb
index cac10d5e7f..c951d69041 100644
--- a/modules/exploits/windows/fileformat/aol_phobos_bof.rb
+++ b/modules/exploits/windows/fileformat/aol_phobos_bof.rb
@@ -59,7 +59,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '61964'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11204' ],
+					[ 'EDB', 11204 ],
 					[ 'URL', 'http://www.rec-sec.com/2010/01/25/aol-playlist-class-buffer-overflow/' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/fileformat/audio_wkstn_pls.rb b/modules/exploits/windows/fileformat/audio_wkstn_pls.rb
index 064f176120..06f2948a1b 100644
--- a/modules/exploits/windows/fileformat/audio_wkstn_pls.rb
+++ b/modules/exploits/windows/fileformat/audio_wkstn_pls.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2009-0476' ],
 					[ 'OSVDB', '55424' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10353' ],
+					[ 'EDB', 10353 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/audiotran_pls.rb b/modules/exploits/windows/fileformat/audiotran_pls.rb
index 2a4ee422c9..46c3daab97 100644
--- a/modules/exploits/windows/fileformat/audiotran_pls.rb
+++ b/modules/exploits/windows/fileformat/audiotran_pls.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2009-0476'],
 					[ 'OSVDB', '55424'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11079' ],
+					[ 'EDB', 11079 ],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb b/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb
index 48f36ccb02..bf19c7587a 100644
--- a/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb
+++ b/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					['OSVDB', '77043'],
-					['URL', 'http://www.exploit-db.com/exploits/18096/'],
+					['EDB', 18096],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/bsplayer_m3u.rb b/modules/exploits/windows/fileformat/bsplayer_m3u.rb
index e5bed19baa..0c445626c3 100644
--- a/modules/exploits/windows/fileformat/bsplayer_m3u.rb
+++ b/modules/exploits/windows/fileformat/bsplayer_m3u.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				],
 			'References'     =>
 				[
-					[ 'URL', 'http://www.exploit-db.com/exploits/15934/' ]
+					[ 'EDB', 15934 ]
 				],
 			'DefaultOptions'  =>
 				{
diff --git a/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb b/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
index c131c2eb51..7e305f2a27 100644
--- a/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					['OSVDB', '77453'],
-					['URL', 'http://www.exploit-db.com/exploits/18178/']
+					['EDB', 18178]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/deepburner_path.rb b/modules/exploits/windows/fileformat/deepburner_path.rb
index d90c8756b3..3876c04d38 100644
--- a/modules/exploits/windows/fileformat/deepburner_path.rb
+++ b/modules/exploits/windows/fileformat/deepburner_path.rb
@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2006-6665' ],
 					[ 'URL', 'http://milw0rm.com/exploits/2950' ],
 					[ 'URL', 'http://milw0rm.com/exploits/8335' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11315' ]
+					[ 'EDB', 11315 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/digital_music_pad_pls.rb b/modules/exploits/windows/fileformat/digital_music_pad_pls.rb
index 2b8bcb1412..569b1a82b0 100644
--- a/modules/exploits/windows/fileformat/digital_music_pad_pls.rb
+++ b/modules/exploits/windows/fileformat/digital_music_pad_pls.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'OSVDB', '68178' ],
 					[ 'URL', 'http://secunia.com/advisories/41519/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15134' ],
+					[ 'EDB', 15134 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/djstudio_pls_bof.rb b/modules/exploits/windows/fileformat/djstudio_pls_bof.rb
index 3c0415d907..073134a49f 100644
--- a/modules/exploits/windows/fileformat/djstudio_pls_bof.rb
+++ b/modules/exploits/windows/fileformat/djstudio_pls_bof.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2009-4656'],
 					[ 'OSVDB', '58159'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10827' ]
+					[ 'EDB', 10827 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/dvdx_plf_bof.rb b/modules/exploits/windows/fileformat/dvdx_plf_bof.rb
index 576426bcc7..77d5b7c2bc 100644
--- a/modules/exploits/windows/fileformat/dvdx_plf_bof.rb
+++ b/modules/exploits/windows/fileformat/dvdx_plf_bof.rb
@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2007-3068' ],
 					[ 'OSVDB', '36956' ],
 					[ 'BID', '24278' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17745' ],
+					[ 'EDB', 17745 ],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb b/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb
index 7941b800b3..079b08cbab 100644
--- a/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb
+++ b/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb
@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '75456' ],
 					[ 'BID', '49600' ],
 					[ 'URL', 'http://aluigi.altervista.org/adv/esignal_1-adv.txt' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17837/' ]
+					[ 'EDB', 17837 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/ezip_wizard_bof.rb b/modules/exploits/windows/fileformat/ezip_wizard_bof.rb
index 6875b4045f..391cc5b215 100644
--- a/modules/exploits/windows/fileformat/ezip_wizard_bof.rb
+++ b/modules/exploits/windows/fileformat/ezip_wizard_bof.rb
@@ -46,8 +46,8 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '52815' ],
 					[ 'BID', '34044' ],
 					[ 'URL', 'http://www.edisys.com/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/8180' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12059/' ],
+					[ 'EDB', 8180 ],
+					[ 'EDB', 12059 ],
 				],
 			'Platform'          => [ 'win' ],
 			'Payload'           =>
diff --git a/modules/exploits/windows/fileformat/feeddemon_opml.rb b/modules/exploits/windows/fileformat/feeddemon_opml.rb
index 64a4b1fbcf..0bca66f086 100644
--- a/modules/exploits/windows/fileformat/feeddemon_opml.rb
+++ b/modules/exploits/windows/fileformat/feeddemon_opml.rb
@@ -41,9 +41,9 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2009-0546' ],
 					[ 'OSVDB', '51753' ],
 					[ 'BID', '33630' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/7995' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/8010' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11379' ]
+					[ 'EDB', 7995 ],
+					[ 'EDB', 8010 ],
+					[ 'EDB', 11379 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/foxit_title_bof.rb b/modules/exploits/windows/fileformat/foxit_title_bof.rb
index 1e9e1cc600..099bb8c998 100644
--- a/modules/exploits/windows/fileformat/foxit_title_bof.rb
+++ b/modules/exploits/windows/fileformat/foxit_title_bof.rb
@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					#[ 'CVE', '' ],
 					[ 'OSVDB', '68648' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15532' ],
+					[ 'EDB', 15532 ],
 					[ 'URL', 'http://www.corelan.be:8800/index.php/2010/11/13/offensive-security-exploit-weekend/' ]
 				],
 			'Payload'	=>
diff --git a/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb b/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
index b434d02df5..05d117a1cf 100644
--- a/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
+++ b/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
@@ -32,8 +32,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDG', '63349' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11975' ], #Initial disclosure
-					[ 'URL', 'http://www.exploit-db.com/exploits/17727/' ] #This exploit is based on this poc
+					[ 'EDB', 11975 ], #Initial disclosure
+					[ 'EDB', 17727 ] #This exploit is based on this poc
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/galan_fileformat_bof.rb b/modules/exploits/windows/fileformat/galan_fileformat_bof.rb
index 73c0daf7d5..b9e74b37ae 100644
--- a/modules/exploits/windows/fileformat/galan_fileformat_bof.rb
+++ b/modules/exploits/windows/fileformat/galan_fileformat_bof.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References' =>
 				[
 					[ 'OSVDB', '60897' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10339' ],
+					[ 'EDB', 10339 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/gta_samp.rb b/modules/exploits/windows/fileformat/gta_samp.rb
index 705eb1ad7f..d45dec0a0a 100644
--- a/modules/exploits/windows/fileformat/gta_samp.rb
+++ b/modules/exploits/windows/fileformat/gta_samp.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'URL', 'http://www.exploit-db.com/exploits/17893' ]
+					[ 'EDB', 17893 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb b/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb
index 777bb9f89e..298fc1f27a 100644
--- a/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb
+++ b/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb
@@ -32,8 +32,8 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2006-0564'],
 					[ 'OSVDB', '22941'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/1488' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/1490' ],
+					[ 'EDB', 1488 ],
+					[ 'EDB', 1490 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb b/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb
index fe23655edd..6e75846cbc 100644
--- a/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb
+++ b/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb
@@ -31,8 +31,8 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2006-0564' ],
 					[ 'OSVDB', '22941' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/1470' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/1495' ],
+					[ 'EDB', 1470 ],
+					[ 'EDB', 1495 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb b/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb
index b76e40fda9..09261ce1f7 100644
--- a/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb
+++ b/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb
@@ -32,8 +32,8 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2009-0133' ],
 					[ 'BID', '33189' ],
 					[ 'OSVDB', '22941' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10323' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10335' ],
+					[ 'EDB', 10323 ],
+					[ 'EDB', 10335 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/ideal_migration_ipj.rb b/modules/exploits/windows/fileformat/ideal_migration_ipj.rb
index a4064a77de..a934f35520 100644
--- a/modules/exploits/windows/fileformat/ideal_migration_ipj.rb
+++ b/modules/exploits/windows/fileformat/ideal_migration_ipj.rb
@@ -35,10 +35,10 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2009-4265' ],
 					[ 'OSVDB', '60681' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10319' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12403' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12404' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12540' ]
+					[ 'EDB', 10319 ],
+					[ 'EDB', 12403 ],
+					[ 'EDB', 12404 ],
+					[ 'EDB', 12540 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/microp_mppl.rb b/modules/exploits/windows/fileformat/microp_mppl.rb
index 44ab7f0d8a..b893f7a6db 100644
--- a/modules/exploits/windows/fileformat/microp_mppl.rb
+++ b/modules/exploits/windows/fileformat/microp_mppl.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '73627'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14720' ],
+					[ 'EDB', 14720 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/millenium_mp3_pls.rb b/modules/exploits/windows/fileformat/millenium_mp3_pls.rb
index 18691bb9a9..f02e8b8ba0 100644
--- a/modules/exploits/windows/fileformat/millenium_mp3_pls.rb
+++ b/modules/exploits/windows/fileformat/millenium_mp3_pls.rb
@@ -33,8 +33,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '56574' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9618' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10240' ],
+					[ 'EDB', 9618 ],
+					[ 'EDB', 10240 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb b/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
index 06d85f630e..7b33f47358 100644
--- a/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
+++ b/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
@@ -30,7 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision: $',
 			'References'     =>
 				[
-					[ 'URL', 'http://www.exploit-db.com/exploits/14373/' ],
+					[ 'EDB', 14373 ],
 					[ 'BID', '34514' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/fileformat/mymp3player_m3u.rb b/modules/exploits/windows/fileformat/mymp3player_m3u.rb
index 2a682f6ff7..cfcae75f2f 100644
--- a/modules/exploits/windows/fileformat/mymp3player_m3u.rb
+++ b/modules/exploits/windows/fileformat/mymp3player_m3u.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '64580'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11791' ],
+					[ 'EDB', 11791 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/orbital_viewer_orb.rb b/modules/exploits/windows/fileformat/orbital_viewer_orb.rb
index eef4a1d3bd..8e182d3660 100644
--- a/modules/exploits/windows/fileformat/orbital_viewer_orb.rb
+++ b/modules/exploits/windows/fileformat/orbital_viewer_orb.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '62580' ],
 					[ 'CVE', '2010-0688' ],
 					[ 'URL', 'http://www.corelan.be:8800/index.php/forum/security-advisories/corelan-10-011-orbital-viewer-orb-buffer-overflow/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11581' ]
+					[ 'EDB', 11581 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb b/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb
index f848cd32c1..71ed271a78 100644
--- a/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb
+++ b/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb
@@ -31,8 +31,8 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2009-3214' ],
 					[ 'OSVDB', '57226' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9483' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9519' ],
+					[ 'EDB', 9483 ],
+					[ 'EDB', 9519 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb b/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb
index 0a120ca108..b1a409bdce 100644
--- a/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb
+++ b/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'BID', '46059' ],
 					[ 'URL', 'http://proforma.real.com' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/16083/' ],
+					[ 'EDB', 16083 ],
 				],
 			'Platform'          => [ 'win' ],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/fileformat/scadaphone_zip.rb b/modules/exploits/windows/fileformat/scadaphone_zip.rb
index 0eaf34fdde..c175e4ca9e 100644
--- a/modules/exploits/windows/fileformat/scadaphone_zip.rb
+++ b/modules/exploits/windows/fileformat/scadaphone_zip.rb
@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					#[ 'CVE', '' ],
 					[ 'OSVDB', '75375' ],
 					[ 'URL', 'http://www.scadatec.com/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17817/' ],
+					[ 'EDB', 17817 ],
 				],
 			'Platform'          => [ 'win' ],
 			'Payload'           =>
diff --git a/modules/exploits/windows/fileformat/somplplayer_m3u.rb b/modules/exploits/windows/fileformat/somplplayer_m3u.rb
index efe64cbb2c..1aad6a4d99 100644
--- a/modules/exploits/windows/fileformat/somplplayer_m3u.rb
+++ b/modules/exploits/windows/fileformat/somplplayer_m3u.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '64368' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11219' ],
+					[ 'EDB', 11219 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb b/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb
index a91cf5eaf8..d7213c04b2 100644
--- a/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'URL', 'http://sourceforge.net/projects/subtitleproc/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17217/' ],
+					[ 'EDB', 17217 ],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/tugzip.rb b/modules/exploits/windows/fileformat/tugzip.rb
index 0acb49e0c8..88c5fef117 100644
--- a/modules/exploits/windows/fileformat/tugzip.rb
+++ b/modules/exploits/windows/fileformat/tugzip.rb
@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '49371' ],
 					[ 'CVE', '2008-4779' ],
 					[ 'BID', '31913' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12008/' ]
+					[ 'EDB', 12008 ]
 				],
 			'Platform'       => [ 'win' ],
 			'Payload'        =>
diff --git a/modules/exploits/windows/fileformat/ultraiso_ccd.rb b/modules/exploits/windows/fileformat/ultraiso_ccd.rb
index 8cde5fbd8a..7561fe0b2d 100644
--- a/modules/exploits/windows/fileformat/ultraiso_ccd.rb
+++ b/modules/exploits/windows/fileformat/ultraiso_ccd.rb
@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'BID', '38613' ],
 					# NOTE: The following OSVDB entry seems invalid, the IMG file doesn't appear to trigger any vulnerability.
 					# [ 'OS-VDB', '53425' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/8343' ]
+					[ 'EDB', 8343 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/ultraiso_cue.rb b/modules/exploits/windows/fileformat/ultraiso_cue.rb
index fbb7aaaf08..98b20c4104 100644
--- a/modules/exploits/windows/fileformat/ultraiso_cue.rb
+++ b/modules/exploits/windows/fileformat/ultraiso_cue.rb
@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2007-2888' ],
 					[ 'OSVDB', '36570' ],
 					[ 'BID', '24140' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/3978' ]
+					[ 'EDB', 3978 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/varicad_dwb.rb b/modules/exploits/windows/fileformat/varicad_dwb.rb
index f5bd723499..f800942898 100644
--- a/modules/exploits/windows/fileformat/varicad_dwb.rb
+++ b/modules/exploits/windows/fileformat/varicad_dwb.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'OSVDB', '63067' ],
 					[ 'BID', '38815' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11789' ]
+					[ 'EDB', 11789 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/vlc_smb_uri.rb b/modules/exploits/windows/fileformat/vlc_smb_uri.rb
index 2138236ffa..80c4d760e3 100644
--- a/modules/exploits/windows/fileformat/vlc_smb_uri.rb
+++ b/modules/exploits/windows/fileformat/vlc_smb_uri.rb
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2009-2484' ],
 					[ 'URL', 'http://git.videolan.org/?p=vlc.git;a=commit;h=e60a9038b13b5eb805a76755efc5c6d5e080180f' ],
 					[ 'URL', 'http://milw0rm.com/exploits/9209' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9029' ]
+					[ 'EDB', 9029 ]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/fileformat/wireshark_packet_dect.rb b/modules/exploits/windows/fileformat/wireshark_packet_dect.rb
index 53824fe072..956d119d50 100644
--- a/modules/exploits/windows/fileformat/wireshark_packet_dect.rb
+++ b/modules/exploits/windows/fileformat/wireshark_packet_dect.rb
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '71848'],
 					[ 'URL', 'https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5838' ],
 					[ 'URL', 'https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5836' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17185' ],
+					[ 'EDB', 17185 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/wm_downloader_m3u.rb b/modules/exploits/windows/fileformat/wm_downloader_m3u.rb
index ff388b8b9f..51c4ed5413 100644
--- a/modules/exploits/windows/fileformat/wm_downloader_m3u.rb
+++ b/modules/exploits/windows/fileformat/wm_downloader_m3u.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '66911'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14497/' ],
+					[ 'EDB', 14497 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb b/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb
index e9fc7bf279..fb3deef29b 100644
--- a/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb
+++ b/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '57162' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10371' ],
+					[ 'EDB', 10371 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb b/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb
index 39727163cf..f7abe6c624 100644
--- a/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb
+++ b/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb
@@ -41,9 +41,9 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					#[ 'CVE', '' ],
 					[ 'OSVDB', '66912'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14517' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14633' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15598' ]
+					[ 'EDB', 14517 ],
+					[ 'EDB', 14633 ],
+					[ 'EDB', 15598 ]
 				],
 			'Payload'	=>
 				{
diff --git a/modules/exploits/windows/ftp/ability_server_stor.rb b/modules/exploits/windows/ftp/ability_server_stor.rb
index 55b10146cf..308722b3e9 100644
--- a/modules/exploits/windows/ftp/ability_server_stor.rb
+++ b/modules/exploits/windows/ftp/ability_server_stor.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'URL', '2004-1626' ],
 					[ 'OSVDB', '11030'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/588/'],
+					[ 'EDB', 588],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb b/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb
index e9881a127c..48fd7ece81 100644
--- a/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb
+++ b/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb
@@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					#[ 'OSVDB', '---' ],
 					#[ 'CVE', '---' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/18102/' ]
+					[ 'EDB', 18102 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ftp/easyftp_list_fixret.rb b/modules/exploits/windows/ftp/easyftp_list_fixret.rb
index b97ca43ca3..facd2bd80f 100644
--- a/modules/exploits/windows/ftp/easyftp_list_fixret.rb
+++ b/modules/exploits/windows/ftp/easyftp_list_fixret.rb
@@ -46,8 +46,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '62134' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14400/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14451/' ]
+					[ 'EDB', 14400 ],
+					[ 'EDB', 14451 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb b/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb
index 4e2884bb5a..4c6ab71e1e 100644
--- a/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb
+++ b/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb
@@ -43,8 +43,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '62134' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12044/' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14399/' ]
+					[ 'EDB', 12044 ],
+					[ 'EDB', 14399 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ftp/goldenftp_pass_bof.rb b/modules/exploits/windows/ftp/goldenftp_pass_bof.rb
index cd8ad4f6e4..bf1f0c0342 100644
--- a/modules/exploits/windows/ftp/goldenftp_pass_bof.rb
+++ b/modules/exploits/windows/ftp/goldenftp_pass_bof.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2006-6576'],
 					[ 'OSVDB', '35951'],
 					[ 'BID', '45957'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/16036/'],
+					[ 'EDB', 16036],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb b/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb
index 76c4fdfd47..13730739c1 100644
--- a/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb
+++ b/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['URL', 'http://www.exploit-db.com/exploits/9541/'],
+					['EDB', 9541],
 					['CVE', '2009-3023'],
 					['OSVDB', '57589'],
 					['BID', '36189'],
diff --git a/modules/exploits/windows/ftp/scriptftp_list.rb b/modules/exploits/windows/ftp/scriptftp_list.rb
index 95b3285609..64ed97160e 100644
--- a/modules/exploits/windows/ftp/scriptftp_list.rb
+++ b/modules/exploits/windows/ftp/scriptftp_list.rb
@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2011-3976' ],
 					[ 'OSVDB', '75633' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17876/' ],
+					[ 'EDB', 17876 ],
 					[ 'URL', 'http://www.kb.cert.org/vuls/id/440219' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/ftp/trellian_client_pasv.rb b/modules/exploits/windows/ftp/trellian_client_pasv.rb
index 28a0bf5ddd..5ee4fec637 100644
--- a/modules/exploits/windows/ftp/trellian_client_pasv.rb
+++ b/modules/exploits/windows/ftp/trellian_client_pasv.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2010-1465'],
 					[ 'OSVDB', '63812'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12152' ],
+					[ 'EDB', 12152 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ftp/vermillion_ftpd_port.rb b/modules/exploits/windows/ftp/vermillion_ftpd_port.rb
index bdce185da4..26bec2316d 100644
--- a/modules/exploits/windows/ftp/vermillion_ftpd_port.rb
+++ b/modules/exploits/windows/ftp/vermillion_ftpd_port.rb
@@ -56,7 +56,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '62163' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11293' ],
+					[ 'EDB', 11293 ],
 					[ 'URL', 'http://www.global-evolution.info/news/files/vftpd/vftpd.txt' ]
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/ftp/xftp_client_pwd.rb b/modules/exploits/windows/ftp/xftp_client_pwd.rb
index 2ad4b4ebc1..598fd60ae8 100644
--- a/modules/exploits/windows/ftp/xftp_client_pwd.rb
+++ b/modules/exploits/windows/ftp/xftp_client_pwd.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '63968'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/12332' ],
+					[ 'EDB', 12332 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb b/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb
index df4cf60e1d..ca1897ea3c 100644
--- a/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb
+++ b/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'URL', 'http://www.exploit-db.com/exploits/17574/' ],
+					[ 'EDB', 17574 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/http/easyftp_list.rb b/modules/exploits/windows/http/easyftp_list.rb
index 9b39eec5fc..a1be8431aa 100644
--- a/modules/exploits/windows/http/easyftp_list.rb
+++ b/modules/exploits/windows/http/easyftp_list.rb
@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '66614'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/11500/' ]
+					[ 'EDB', 11500 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/http/kolibri_http.rb b/modules/exploits/windows/http/kolibri_http.rb
index c7c32ef4ee..55302dc4fd 100644
--- a/modules/exploits/windows/http/kolibri_http.rb
+++ b/modules/exploits/windows/http/kolibri_http.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2002-2268' ],
 					[ 'OSVDB', '70808' ],
 					[ 'BID', '6289' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15834/' ],
+					[ 'EDB', 15834 ],
 				],
 			'Privileged'     => false,
 			'Payload'        =>
diff --git a/modules/exploits/windows/misc/bigant_server_250.rb b/modules/exploits/windows/misc/bigant_server_250.rb
index e0167c0257..2ed709b1e1 100644
--- a/modules/exploits/windows/misc/bigant_server_250.rb
+++ b/modules/exploits/windows/misc/bigant_server_250.rb
@@ -34,8 +34,8 @@ class Metasploit3 < Msf::Exploit::Remote
 					# the v2.2 vuln back in Dec 2008
 					[ 'CVE', '2008-1914'],
 					[ 'OSVDB', '44454'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9673' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/9690' ]
+					[ 'EDB', 9673 ],
+					[ 'EDB', 9690 ]
 					#[ 'B_ID', '28795' ],
 					#[ 'U_RL', 'http://www.milw0rm.com/exploits/5451'],
 				],
diff --git a/modules/exploits/windows/misc/bigant_server_usv.rb b/modules/exploits/windows/misc/bigant_server_usv.rb
index e8cd82964d..753c810cdd 100644
--- a/modules/exploits/windows/misc/bigant_server_usv.rb
+++ b/modules/exploits/windows/misc/bigant_server_usv.rb
@@ -38,8 +38,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '61386' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10765' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10973' ]
+					[ 'EDB', 10765 ],
+					[ 'EDB', 10973 ]
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/misc/eureka_mail_err.rb b/modules/exploits/windows/misc/eureka_mail_err.rb
index de3bced1bc..9a7b9aa011 100644
--- a/modules/exploits/windows/misc/eureka_mail_err.rb
+++ b/modules/exploits/windows/misc/eureka_mail_err.rb
@@ -40,7 +40,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2009-3837' ],
 					[ 'OSVDB', '59262' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10235' ],
+					[ 'EDB', 10235 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/misc/hp_omniinet_4.rb b/modules/exploits/windows/misc/hp_omniinet_4.rb
index 5bcea4eb0b..a26b1c8a41 100644
--- a/modules/exploits/windows/misc/hp_omniinet_4.rb
+++ b/modules/exploits/windows/misc/hp_omniinet_4.rb
@@ -42,7 +42,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'CVE', '2011-1865' ],
 					[ 'OSVDB', '73571'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17468/' ],
+					[ 'EDB', 17468 ],
 					[ 'URL', 'http://www.coresecurity.com/content/HP-Data-Protector-multiple-vulnerabilities' ],
 					[ 'URL', 'http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c02872182' ],
 				],
diff --git a/modules/exploits/windows/misc/mini_stream.rb b/modules/exploits/windows/misc/mini_stream.rb
index f19bf2055e..380d89738f 100644
--- a/modules/exploits/windows/misc/mini_stream.rb
+++ b/modules/exploits/windows/misc/mini_stream.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References' =>
 				[
 					[ 'OSVDB', '61341' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10745' ],
+					[ 'EDB', 10745 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/misc/nettransport.rb b/modules/exploits/windows/misc/nettransport.rb
index d549b8b0f2..1603a1f843 100644
--- a/modules/exploits/windows/misc/nettransport.rb
+++ b/modules/exploits/windows/misc/nettransport.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'OSVDB', '61435' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/10911'],
+					[ 'EDB', 10911],
 				],
 			'Privileged'     => false,
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/misc/splayer_content_type.rb b/modules/exploits/windows/misc/splayer_content_type.rb
index ed5ca05836..2bb9a3abc8 100644
--- a/modules/exploits/windows/misc/splayer_content_type.rb
+++ b/modules/exploits/windows/misc/splayer_content_type.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					['OSVDB', '72181'],
-					['URL', 'http://www.exploit-db.com/exploits/17243/'],
+					['EDB', 17243],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/misc/stream_down_bof.rb b/modules/exploits/windows/misc/stream_down_bof.rb
index 8f6bace521..9c06d5ccfa 100644
--- a/modules/exploits/windows/misc/stream_down_bof.rb
+++ b/modules/exploits/windows/misc/stream_down_bof.rb
@@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['BID', '51190'],
 					['URL', 'http://www.dark-masters.tk/'],
 					['URL', 'http://secunia.com/advisories/47343/'],
-					['URL', 'http://www.exploit-db.com/exploits/18283/']
+					['EDB', 18283]
 				],
 			'Privileged'     => false,
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/misc/ufo_ai.rb b/modules/exploits/windows/misc/ufo_ai.rb
index 378fc55996..d55c6a48dd 100644
--- a/modules/exploits/windows/misc/ufo_ai.rb
+++ b/modules/exploits/windows/misc/ufo_ai.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References' =>
 				[
 					[ 'OSVDB', '65689'],
-					[ 'URL', 'http://www.exploit-db.com/exploits/14013' ]
+					[ 'EDB', 14013 ]
 				],
 			'Payload' =>
 				{
diff --git a/modules/exploits/windows/misc/wireshark_packet_dect.rb b/modules/exploits/windows/misc/wireshark_packet_dect.rb
index 0d10de4017..d97889ae52 100644
--- a/modules/exploits/windows/misc/wireshark_packet_dect.rb
+++ b/modules/exploits/windows/misc/wireshark_packet_dect.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '71848'],
 					[ 'URL', 'https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5838' ],
 					[ 'URL', 'https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5836' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/17185' ],
+					[ 'EDB', 17185 ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/scada/codesys_web_server.rb b/modules/exploits/windows/scada/codesys_web_server.rb
index 811d41618c..4a2fcfad0d 100644
--- a/modules/exploits/windows/scada/codesys_web_server.rb
+++ b/modules/exploits/windows/scada/codesys_web_server.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					[ 'OSVDB', '77387'],
 					[ 'URL', 'http://aluigi.altervista.org/adv/codesys_1-adv.txt' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/18187/' ],
+					[ 'EDB', 18187 ],
 					[ 'URL', 'http://www.us-cert.gov/control_systems/pdf/ICS-ALERT-11-336-01A.pdf' ],
 					# The following clearifies why two people are credited for the discovery
 					[ 'URL', 'http://www.us-cert.gov/control_systems/pdf/ICSA-12-006-01.pdf']
diff --git a/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb b/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
index c8369a3dcf..9d593ad9ea 100644
--- a/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
+++ b/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					['OSVDB', '72135'],
 					['URL', 'http://www.security-assessment.com/files/documents/advisory/ICONICS_WebHMI.pdf'],
-					['URL', 'http://www.exploit-db.com/exploits/17240/'],
+					['EDB', 17240],
 					['URL', 'http://www.us-cert.gov/control_systems/pdf/ICS-ALERT-11-080-02.pdf']
 				],
 			'Payload'        =>
diff --git a/modules/exploits/windows/smtp/njstar_smtp_bof.rb b/modules/exploits/windows/smtp/njstar_smtp_bof.rb
index 66bf293b78..b7b8da687e 100644
--- a/modules/exploits/windows/smtp/njstar_smtp_bof.rb
+++ b/modules/exploits/windows/smtp/njstar_smtp_bof.rb
@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'OSVDB', '76728' ],
 					#[ 'CVE', '' ],
 					[ 'URL', 'http://www.njstar.com/cms/njstar-communicator' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/18057/' ]
+					[ 'EDB', 18057 ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/ssh/sysax_ssh_username.rb b/modules/exploits/windows/ssh/sysax_ssh_username.rb
index 56d9fc84ff..852a44bcd5 100644
--- a/modules/exploits/windows/ssh/sysax_ssh_username.rb
+++ b/modules/exploits/windows/ssh/sysax_ssh_username.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					['OSVDB', '79689'],
 					['URL', 'http://www.pwnag3.com/2012/02/sysax-multi-server-ssh-username-exploit.html'],
-					['URL', 'http://www.exploit-db.com/exploits/18535/']
+					['EDB', 18535]
 				],
 			'Payload'        =>
 				{
diff --git a/modules/post/windows/escalate/ms10_073_kbdlayout.rb b/modules/post/windows/escalate/ms10_073_kbdlayout.rb
index a887d4d5df..0ec7293f3c 100644
--- a/modules/post/windows/escalate/ms10_073_kbdlayout.rb
+++ b/modules/post/windows/escalate/ms10_073_kbdlayout.rb
@@ -41,7 +41,7 @@ class Metasploit3 < Msf::Post
 					[ 'MSB', 'MS10-073' ],
 					[ 'URL', 'http://www.vupen.com/blog/20101018.Stuxnet_Win32k_Windows_Kernel_0Day_Exploit_CVE-2010-2743.php' ],
 					[ 'URL', 'http://www.reversemode.com/index.php?option=com_content&task=view&id=71&Itemid=1' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15985/' ]
+					[ 'EDB', 15985 ]
 				],
 			'DisclosureDate'=> "Oct 12 2010"
 		))
diff --git a/modules/post/windows/escalate/ms10_092_schelevator.rb b/modules/post/windows/escalate/ms10_092_schelevator.rb
index 2f7e24c4d2..b4d0815f88 100644
--- a/modules/post/windows/escalate/ms10_092_schelevator.rb
+++ b/modules/post/windows/escalate/ms10_092_schelevator.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Post
 					[ 'CVE', '2010-3338' ],
 					[ 'BID', '44357' ],
 					[ 'MSB', 'MS10-092' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/15589/' ]
+					[ 'EDB', 15589 ]
 				],
 			'DisclosureDate'=> 'Sep 13 2010'
 		))
diff --git a/modules/post/windows/escalate/net_runtime_modify.rb b/modules/post/windows/escalate/net_runtime_modify.rb
index af79ad2895..522a098d5e 100644
--- a/modules/post/windows/escalate/net_runtime_modify.rb
+++ b/modules/post/windows/escalate/net_runtime_modify.rb
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Post
 			'References'    =>
 				[
 					[ 'OSVDB', '71013' ],
-					[ 'URL', 'http://www.exploit-db.com/exploits/16940/' ]
+					[ 'EDB', 16940 ]
 				]
 		))
 
diff --git a/modules/post/windows/gather/credentials/imail.rb b/modules/post/windows/gather/credentials/imail.rb
index ee10f47a50..ed44c8141e 100644
--- a/modules/post/windows/gather/credentials/imail.rb
+++ b/modules/post/windows/gather/credentials/imail.rb
@@ -35,7 +35,7 @@ class Metasploit3 < Msf::Post
 				],
 			'References'     =>
 				[
-					['URL', 'http://www.exploit-db.com/exploits/11331/'],
+					['EDB', 11331],
 				],
 			'Platform'       => [ 'win' ],
 			'SessionTypes'   => [ 'meterpreter' ]