diff --git a/modules/exploits/linux/http/gpsd_format_string.rb b/modules/exploits/linux/http/gpsd_format_string.rb
index 4ff17c4a8b..ef398b3cb7 100644
--- a/modules/exploits/linux/http/gpsd_format_string.rb
+++ b/modules/exploits/linux/http/gpsd_format_string.rb
@@ -18,6 +18,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$ Revision: 1.0 $',
 			'References'     =>
 				[
+					[ 'CVE', '2004-1388' ],
+					[ 'OSVDB', '13199' ],
+					[ 'BID', '12371' ],
 					[ 'URL', 'http://www.securiteam.com/unixfocus/5LP0M1PEKK.html'],
 
 				],
@@ -89,4 +92,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/multi/browser/qtjava_pointer.rb b/modules/exploits/multi/browser/qtjava_pointer.rb
index 1ec561c427..65d492b1bf 100644
--- a/modules/exploits/multi/browser/qtjava_pointer.rb
+++ b/modules/exploits/multi/browser/qtjava_pointer.rb
@@ -38,8 +38,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
-	  				['BID',    '23608'],
 					['CVE',    '2007-2175'],
+					['OSVDB', '34178'],
+	  				['BID',    '23608'],
 					['URL',    'http://www.zerodayinitiative.com/advisories/ZDI-07-023.html'],
 				],
 			'Payload'        =>
@@ -210,4 +211,4 @@ class Metasploit3 < Msf::Exploit::Remote
 	end
 
 	
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/osx/afp/loginext.rb b/modules/exploits/osx/afp/loginext.rb
index c71fcf805e..1c53da02ac 100644
--- a/modules/exploits/osx/afp/loginext.rb
+++ b/modules/exploits/osx/afp/loginext.rb
@@ -33,9 +33,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
-					[ 'BID', '10271'],
 					[ 'CVE', '2004-0430'],
 					[ 'OSVDB', '5762'],
+					[ 'BID', '10271'],
 					[ 'MIL', '2'],
 				],
 			'Payload'        =>
@@ -108,4 +108,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/osx/arkeia/type77.rb b/modules/exploits/osx/arkeia/type77.rb
index 456368aaf3..93e6075d78 100644
--- a/modules/exploits/osx/arkeia/type77.rb
+++ b/modules/exploits/osx/arkeia/type77.rb
@@ -32,6 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2005-0491'],
 					[ 'OSVDB', '14011'],
 					[ 'BID', '12594'],
 					[ 'URL', 'http://lists.netsys.com/pipermail/full-disclosure/2005-February/031831.html'],
@@ -118,4 +119,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/osx/browser/software_update.rb b/modules/exploits/osx/browser/software_update.rb
index 8e0a3d335d..ecf5696931 100644
--- a/modules/exploits/osx/browser/software_update.rb
+++ b/modules/exploits/osx/browser/software_update.rb
@@ -32,6 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					['CVE', '2007-5863'],
+					['OSVDB', '40722'],
 				],
 			'Payload'        =>
 				{
@@ -147,4 +148,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/unix/webapp/barracuda_img_exec.rb b/modules/exploits/unix/webapp/barracuda_img_exec.rb
index 18d3b9064b..27d3390172 100644
--- a/modules/exploits/unix/webapp/barracuda_img_exec.rb
+++ b/modules/exploits/unix/webapp/barracuda_img_exec.rb
@@ -30,11 +30,11 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['URL', 'http://www.securiweb.net/wiki/Ressources/AvisDeSecurite/2005.1'],
 					['CVE', '2005-2847'],
 					['OSVDB', '19279'],
 					['BID', '14712'],
 					['NSS', '19556'],
+					['URL', 'http://www.securiweb.net/wiki/Ressources/AvisDeSecurite/2005.1'],
 					['MIL', '99'],
 				],
 			'Privileged'     => false,
@@ -98,4 +98,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		end
 	end
 	
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/arkeia/type77.rb b/modules/exploits/windows/arkeia/type77.rb
index 0c640e2f3a..2728a65576 100644
--- a/modules/exploits/windows/arkeia/type77.rb
+++ b/modules/exploits/windows/arkeia/type77.rb
@@ -32,6 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2005-0491' ],
 					[ 'OSVDB', '14011'],
 					[ 'BID', '12594'],
 					[ 'URL', 'http://lists.netsys.com/pipermail/full-disclosure/2005-February/031831.html'],
@@ -125,4 +126,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		data[ 96, seh.length] = seh
 	end
 	
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/apple_itunes_playlist.rb b/modules/exploits/windows/browser/apple_itunes_playlist.rb
index 61c2b54f51..a26ca7884b 100644
--- a/modules/exploits/windows/browser/apple_itunes_playlist.rb
+++ b/modules/exploits/windows/browser/apple_itunes_playlist.rb
@@ -32,8 +32,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
-					[ 'BID', '12238' ],
 					[ 'CVE', '2005-0043' ],
+					[ 'OSVDB', '12833' ],
+					[ 'BID', '12238' ],
 				],
 
 			'DefaultOptions' =>
@@ -79,4 +80,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)		
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/apple_quicktime_rtsp.rb b/modules/exploits/windows/browser/apple_quicktime_rtsp.rb
index 58d79aa636..9410bd2387 100644
--- a/modules/exploits/windows/browser/apple_quicktime_rtsp.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_rtsp.rb
@@ -30,6 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[
 					[ 'CVE', '2007-0015' ],
+					[ 'OSVDB', '31023' ],
 					[ 'BID', '21829' ],
 					[ 'URL', 'http://projects.info-pull.com/moab/MOAB-01-01-2007.html' ],
 				],
@@ -73,4 +74,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(client)		
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/ask_shortformat.rb b/modules/exploits/windows/browser/ask_shortformat.rb
index 1b0beb180d..e314b50456 100644
--- a/modules/exploits/windows/browser/ask_shortformat.rb
+++ b/modules/exploits/windows/browser/ask_shortformat.rb
@@ -30,6 +30,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+					[ 'CVE', '2007-5107' ],
+					[ 'OSVDB', '37735' ],
 					[ 'URL', 'http://wslabi.com/wabisabilabi/showBidInfo.do?code=ZD-00000148' ],
 				],
 			'DefaultOptions' =>
@@ -93,4 +95,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/bearshare_setformatlikesample.rb b/modules/exploits/windows/browser/bearshare_setformatlikesample.rb
index d05b6c8bb0..f004cb80ed 100644
--- a/modules/exploits/windows/browser/bearshare_setformatlikesample.rb
+++ b/modules/exploits/windows/browser/bearshare_setformatlikesample.rb
@@ -30,6 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[
 					[ 'CVE', '2007-0018' ],
+					[ 'OSVDB', '32032' ],
 					[ 'BID', '23892' ],
 					[ 'URL', 'http://lists.grok.org.uk/pipermail/full-disclosure/2007-May/062911.html' ],
 				],
@@ -85,4 +86,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/ftp/dreamftp_format.rb b/modules/exploits/windows/ftp/dreamftp_format.rb
index 9f64e08f91..31591af552 100644
--- a/modules/exploits/windows/ftp/dreamftp_format.rb
+++ b/modules/exploits/windows/ftp/dreamftp_format.rb
@@ -29,10 +29,10 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        	=> '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '9800'],
 					[ 'CVE', '2004-2074'],
-					[ 'URL', 'http://www.milw0rm.com/exploits/823'],
 					[ 'OSVDB', '4986'],
+					[ 'BID', '9800'],
+					[ 'URL', 'http://www.milw0rm.com/exploits/823'],
 				],
 			'Platform' 	=> ['win'],
 			'Privileged'	=> false,
@@ -83,4 +83,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/apache_chunked.rb b/modules/exploits/windows/http/apache_chunked.rb
index ffe6c9cb4e..6f635e1dee 100644
--- a/modules/exploits/windows/http/apache_chunked.rb
+++ b/modules/exploits/windows/http/apache_chunked.rb
@@ -38,9 +38,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '5033' ],
 					[ 'CVE', '2002-0392' ],
 					[ 'OSVDB', '838'],
+					[ 'BID', '5033' ],
 					[ 'URL', 'http://lists.insecure.org/lists/bugtraq/2002/Jun/0184.html'],
 					[ 'MIL', '4'],
 
@@ -255,4 +255,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		}
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb b/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb
index 662fa297d8..196350e222 100644
--- a/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb
+++ b/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb
@@ -34,9 +34,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '19204' ],
 					[ 'CVE', '2006-3747' ],
 					[ 'OSVDB', '27588' ],
+					[ 'BID', '19204' ],
 					[ 'URL', 'http://archives.neohapsis.com/archives/bugtraq/2006-07/0514.html' ],
 					[ 'URL', 'http://www.milw0rm.com/exploits/3680' ],
 					[ 'URL', 'http://www.milw0rm.com/exploits/3996' ],
@@ -100,4 +100,4 @@ class Metasploit3 < Msf::Exploit::Remote
 				}, 2)
 		handler
 	end
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/apache_modjk_overflow.rb b/modules/exploits/windows/http/apache_modjk_overflow.rb
index 8a18057eb0..eb4e631cfe 100644
--- a/modules/exploits/windows/http/apache_modjk_overflow.rb
+++ b/modules/exploits/windows/http/apache_modjk_overflow.rb
@@ -18,8 +18,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'License'        => MSF_LICENSE,
 			'References'     =>
 				[
-					[ 'BID', '22791'],
 					[ 'CVE', '2007-0774' ],
+					[ 'OSVDB', '33855' ],
+					[ 'BID', '22791'],
 					[ 'URL', 'http://www.zerodayinitiative.com/advisories/ZDI-07-008.html'],
 
 				],
@@ -94,4 +95,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/badblue_ext_overflow.rb b/modules/exploits/windows/http/badblue_ext_overflow.rb
index 5c1584d408..9460ed881b 100644
--- a/modules/exploits/windows/http/badblue_ext_overflow.rb
+++ b/modules/exploits/windows/http/badblue_ext_overflow.rb
@@ -29,8 +29,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '7387' ],
+					[ 'CVE', '2005-0595' ],
 					[ 'OSVDB', '14238' ],
+					[ 'BID', '7387' ],
 					[ 'MIL', '11' ],
 				],
 			'DefaultOptions' =>
@@ -84,4 +85,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/badblue_passthru.rb b/modules/exploits/windows/http/badblue_passthru.rb
index 3d060153c3..bce989d4d7 100644
--- a/modules/exploits/windows/http/badblue_passthru.rb
+++ b/modules/exploits/windows/http/badblue_passthru.rb
@@ -29,8 +29,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '26803'],
 					['CVE', '2007-6377'],
+					['OSVDB', '42416'],
+					['BID', '26803'],
 				],
 			'DefaultOptions' =>
 				{
@@ -71,4 +72,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/bea_weblogic_jsessionid.rb b/modules/exploits/windows/http/bea_weblogic_jsessionid.rb
index 0d2e7264df..8d6318c84f 100644
--- a/modules/exploits/windows/http/bea_weblogic_jsessionid.rb
+++ b/modules/exploits/windows/http/bea_weblogic_jsessionid.rb
@@ -22,7 +22,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2008-5457' ],
-
+					[ 'OSVDB', '51311' ],
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb b/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb
index 8d12c89343..0979adf159 100644
--- a/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb
+++ b/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb
@@ -25,6 +25,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2008-4008' ],
+					[ 'OSVDB', '49283' ],
 					[ 'URL', 'http://support.bea.com/application_content/product_portlets/securityadvisories/2806.html'],
 
 				],
diff --git a/modules/exploits/windows/http/belkin_bulldog.rb b/modules/exploits/windows/http/belkin_bulldog.rb
index a851a5b5cc..baa9bec309 100644
--- a/modules/exploits/windows/http/belkin_bulldog.rb
+++ b/modules/exploits/windows/http/belkin_bulldog.rb
@@ -24,6 +24,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'OSVDB', '54395' ],
 					[ 'BID', '34033' ],
 				],
 			'Privileged'     => true,
diff --git a/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb b/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb
index 5cf50fc368..885111b161 100644
--- a/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb
+++ b/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb
@@ -27,6 +27,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+					[ 'CVE', '2007-6166' ],
+					[ 'OSVDB', '40876' ],
 					[ 'BID', '26549' ], 
 					[ 'URL', 'http://milw0rm.com/exploits/4648' ],
 				],
@@ -100,4 +102,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		service.close_client(client)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb b/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb
index c0ad94abac..90ab49fd82 100644
--- a/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb
+++ b/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb
@@ -30,8 +30,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[ 
 					[ 'CVE', '2008-1491' ],
-					[ 'BID', '28394' ],
 					[ 'OSVDB', '43638' ],
+					[ 'BID', '28394' ],
 				],
 			'DefaultOptions' =>
 				{
@@ -71,4 +71,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/misc/bakbone_netvault_heap.rb b/modules/exploits/windows/misc/bakbone_netvault_heap.rb
index bee012ac5d..19342aaff4 100644
--- a/modules/exploits/windows/misc/bakbone_netvault_heap.rb
+++ b/modules/exploits/windows/misc/bakbone_netvault_heap.rb
@@ -30,8 +30,10 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+					['CVE', '2005-1009'],
+					['OSVDB', '15234'],
 					['MIL', '12'],
-					['BID', '12967']
+					['BID', '12967'],
 				],
 			'Payload'        =>
 				{
@@ -159,4 +161,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		5
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/misc/bigant_server.rb b/modules/exploits/windows/misc/bigant_server.rb
index 4f050aeb17..c1f078b791 100644
--- a/modules/exploits/windows/misc/bigant_server.rb
+++ b/modules/exploits/windows/misc/bigant_server.rb
@@ -31,8 +31,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[ 
-					[ 'BID', '28795' ],
 					[ 'CVE', '2008-1914' ],
+					[ 'OSVDB', '44454' ],
+					[ 'BID', '28795' ],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -73,4 +74,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/misc/bomberclone_overflow.rb b/modules/exploits/windows/misc/bomberclone_overflow.rb
index cf163553d6..a3cda26547 100644
--- a/modules/exploits/windows/misc/bomberclone_overflow.rb
+++ b/modules/exploits/windows/misc/bomberclone_overflow.rb
@@ -34,6 +34,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+					['CVE', '2006-0460'],
 					['OSVDB', '23263'],
 					['BID', '16697'],
 					['URL', 'http://www.frsirt.com/english/advisories/2006/0643' ],
@@ -78,4 +79,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect_udp
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb b/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb
index 3091329cc0..b32916d2d5 100644
--- a/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb
+++ b/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb
@@ -32,6 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[ 
 					['CVE', '2005-4085'],
+					['OSVDB', '22238'],
 					['BID', '16147'],
 					['URL', 'http://www.bluecoat.com/support/knowledge/advisory_host_header_stack_overflow.html'],
 
@@ -84,4 +85,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end