diff --git a/modules/auxiliary/sniffer/psnuffle.rb b/modules/auxiliary/sniffer/psnuffle.rb
index ef71472212..c233d28ca1 100644
--- a/modules/auxiliary/sniffer/psnuffle.rb
+++ b/modules/auxiliary/sniffer/psnuffle.rb
@@ -118,7 +118,7 @@ class Metasploit3 < Msf::Auxiliary
 			end
 			true
 		end
-		 
+		close_pcap()
 		print_status("Finished sniffing")
 	end
 end 
diff --git a/modules/auxiliary/test/capture.rb b/modules/auxiliary/test/capture.rb
index ace3137ff8..127943aad7 100644
--- a/modules/auxiliary/test/capture.rb
+++ b/modules/auxiliary/test/capture.rb
@@ -59,7 +59,7 @@ class Metasploit3 < Msf::Auxiliary
 			
 			true
 		end
-		
+		close_pcap()
 		print_status("Finished sniffing")
 	end
 	
diff --git a/modules/auxiliary/test/eth_spoof.rb b/modules/auxiliary/test/eth_spoof.rb
index 9344e47c42..feed14cc89 100644
--- a/modules/auxiliary/test/eth_spoof.rb
+++ b/modules/auxiliary/test/eth_spoof.rb
@@ -37,7 +37,7 @@ class Metasploit3 < Msf::Auxiliary
 		print_status("Opening the network interface...")
 		open_pcap()
 
-		r   = Racket::Racket.new
+		r = Racket::Racket.new
 		r.l2 = Racket::Ethernet.new
 		r.l2.ethertype = 0x0800
 		r.l2.src_mac = "00:41:41:41:41:41"
@@ -56,6 +56,7 @@ class Metasploit3 < Msf::Auxiliary
 			capture.inject(r.pack)
 		end
 		
+		close_pcap()
 		print_status("Finished sending")
 	end
 	
diff --git a/modules/exploits/linux/games/ut2004_secure.rb b/modules/exploits/linux/games/ut2004_secure.rb
index 79fdf29e19..6d54990c48 100644
--- a/modules/exploits/linux/games/ut2004_secure.rb
+++ b/modules/exploits/linux/games/ut2004_secure.rb
@@ -41,6 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+				    	[ 'CVE', '2004-0608'],
 					[ 'OSVDB', '7217'],
 					[ 'BID', '10570'],
 					[ 'MIL', '72'],
@@ -122,4 +123,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		return Exploit::CheckCode::Safe
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/linux/http/ddwrt_cgibin_exec.rb b/modules/exploits/linux/http/ddwrt_cgibin_exec.rb
index 7e8ad3a833..63bb4ad365 100644
--- a/modules/exploits/linux/http/ddwrt_cgibin_exec.rb
+++ b/modules/exploits/linux/http/ddwrt_cgibin_exec.rb
@@ -31,6 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'OSVDB', '55990' ],
 					[ 'BID', '35742' ],
 					[ 'URL', 'http://www.milw0rm.com/exploits/9209'],
 
diff --git a/modules/exploits/linux/ids/snortbopre.rb b/modules/exploits/linux/ids/snortbopre.rb
index 2a12000600..78a1d0cfec 100644
--- a/modules/exploits/linux/ids/snortbopre.rb
+++ b/modules/exploits/linux/ids/snortbopre.rb
@@ -31,8 +31,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '15131'],
 					['CVE', '2005-3252'],
+					['OSVDB', '20034'],
+					['BID', '15131'],
 					['URL','http://xforce.iss.net/xforce/alerts/id/207'] ,
 				],
 			'Payload'        =>
@@ -106,4 +107,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect_udp
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/linux/imap/imap_uw_lsub.rb b/modules/exploits/linux/imap/imap_uw_lsub.rb
index 6089a39120..1acc4f443c 100644
--- a/modules/exploits/linux/imap/imap_uw_lsub.rb
+++ b/modules/exploits/linux/imap/imap_uw_lsub.rb
@@ -31,9 +31,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2000-0284' ],
 					[ 'OSVDB', '12037' ],
 					[ 'BID', '1110' ],
-					[ 'CVE', '2000-0284' ],
 					[ 'URL', 'http://www.milw0rm.com/exploits/284' ],
 				],
 			'Privileged'     => false,
@@ -84,4 +84,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb b/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb
index a59a3b3d2a..6f14aafee2 100644
--- a/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb
+++ b/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb
@@ -32,12 +32,11 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2004-0541'],
 					[ 'OSVDB', '6791'],
 					[ 'URL', 'http://www.idefense.com/application/poi/display?id=107'],
 					[ 'BID', '10500'],
-					[ 'CVE', '2004-0541'],
 					[ 'MIL', '67'],
-
 				],
 			'Privileged'     => false,
 			'Payload'        =>
@@ -139,4 +138,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		sock.put(req)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/multi/browser/java_calendar_deserialize.rb b/modules/exploits/multi/browser/java_calendar_deserialize.rb
index 30ab04cb19..9313857d58 100644
--- a/modules/exploits/multi/browser/java_calendar_deserialize.rb
+++ b/modules/exploits/multi/browser/java_calendar_deserialize.rb
@@ -31,6 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'		=> 
 			[
 				[ 'CVE', 'CVE-2008-5353' ],
+				[ 'OSVDB', '50500'],
 				[ 'URL', 'http://slightlyrandombrokenthoughts.blogspot.com/2008/12/calendar-bug.html' ],
 				[ 'URL', 'http://landonf.bikemonkey.org/code/macosx/CVE-2008-5353.20090519.html' ],
 				[ 'URL', 'http://blog.cr0.org/2009/05/write-once-own-everyone.html' ],
diff --git a/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb b/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
index 5372b479d8..eac2bef58e 100644
--- a/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
+++ b/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
@@ -30,8 +30,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'OSVDB', '11026' ],
 					[ 'CVE', '2004-1389' ],
+					[ 'OSVDB', '11026' ],
 					[ 'BID', '11494' ],
 					[ 'URL', 'http://seer.support.veritas.com/docs/271727.htm' ],
 
diff --git a/modules/exploits/multi/svn/svnserve_date.rb b/modules/exploits/multi/svn/svnserve_date.rb
index 7ac33ed78b..9291dec73f 100644
--- a/modules/exploits/multi/svn/svnserve_date.rb
+++ b/modules/exploits/multi/svn/svnserve_date.rb
@@ -35,6 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+				    	['CVE', '2004-0397'],
 					['OSVDB', '6301'],
 					['BID',	'10386'],
 					['URL',   'http://lists.netsys.com/pipermail/full-disclosure/2004-May/021737.html'],
@@ -131,4 +132,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		"#{buf.length}:" + buf
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/solaris/dtspcd/heap_noir.rb b/modules/exploits/solaris/dtspcd/heap_noir.rb
index 29cd52fca5..69db9f8a3d 100644
--- a/modules/exploits/solaris/dtspcd/heap_noir.rb
+++ b/modules/exploits/solaris/dtspcd/heap_noir.rb
@@ -32,9 +32,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '3517'],
-					[ 'OSVDB', '4503'],
 					[ 'CVE', '2001-0803'],
+					[ 'OSVDB', '4503'],
+					[ 'BID', '3517'],
 					[ 'URL', 'http://www.cert.org/advisories/CA-2001-31.html'],
 					[ 'URL', 'http://media.wiley.com/product_ancillary/83/07645446/DOWNLOAD/Source_Files.zip'],
 					[ 'MIL', '61'],
@@ -164,4 +164,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		@spc_seq = 0
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/solaris/lpd/sendmail_exec.rb b/modules/exploits/solaris/lpd/sendmail_exec.rb
index f484399ae9..5e3805260a 100644
--- a/modules/exploits/solaris/lpd/sendmail_exec.rb
+++ b/modules/exploits/solaris/lpd/sendmail_exec.rb
@@ -33,6 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2001-1583'],
 					[ 'OSVDB', '15131'],
 					[ 'BID', '3274'],
 					[ 'MIL', '63'],
diff --git a/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb b/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
index 93e4b039cd..e954734267 100644
--- a/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
+++ b/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
@@ -47,6 +47,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Platform'       => 'solaris',
 			'References'     =>
 				[
+				    	['CVE', '2008-4556'],
+					['OSVDB', '49111'],
 					['URL', 'http://risesecurity.org/advisories/RISE-2008001.txt'],
 				],
 			'Privileged'     => true,
diff --git a/modules/exploits/solaris/sunrpc/sadmind_exec.rb b/modules/exploits/solaris/sunrpc/sadmind_exec.rb
index e297a4a999..ee3bab312a 100644
--- a/modules/exploits/solaris/sunrpc/sadmind_exec.rb
+++ b/modules/exploits/solaris/sunrpc/sadmind_exec.rb
@@ -33,9 +33,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '8615'],
 					['CVE', '2003-0722'],
 					['OSVDB', '4585'],
+					['BID', '8615'],
 					['URL', 'http://lists.insecure.org/lists/vulnwatch/2003/Jul-Sep/0115.html'],
 					['MIL',  '64']
 				],
diff --git a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
index 5f044b980a..d25bdad591 100644
--- a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
+++ b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
@@ -24,9 +24,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '1749'],
 					['CVE', '1999-0209'],
 					['OSVDB', '11517'],
+					['BID', '1749'],
 				],
 			'Privileged'     => true,
 			'Platform'       => ['unix', 'solaris'],
diff --git a/modules/exploits/solaris/telnet/fuser.rb b/modules/exploits/solaris/telnet/fuser.rb
index 370dc31e64..d1d0582887 100644
--- a/modules/exploits/solaris/telnet/fuser.rb
+++ b/modules/exploits/solaris/telnet/fuser.rb
@@ -30,6 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2007-0882' ],
+					[ 'OSVDB', '31881'],
 					[ 'BID', '22512' ],
 				],
 			'Privileged'     => false,
diff --git a/modules/exploits/solaris/telnet/ttyprompt.rb b/modules/exploits/solaris/telnet/ttyprompt.rb
index 5c83180d30..b4487d4c35 100644
--- a/modules/exploits/solaris/telnet/ttyprompt.rb
+++ b/modules/exploits/solaris/telnet/ttyprompt.rb
@@ -29,8 +29,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '5531'],
 					[ 'CVE', '2001-0797'],
+					[ 'OSVDB', '690'],
+					[ 'BID', '5531'],
 					[ 'MIL', '66'],
 
 				],
diff --git a/modules/exploits/unix/misc/spamassassin_exec.rb b/modules/exploits/unix/misc/spamassassin_exec.rb
index afa4b006c8..03fecae965 100644
--- a/modules/exploits/unix/misc/spamassassin_exec.rb
+++ b/modules/exploits/unix/misc/spamassassin_exec.rb
@@ -29,8 +29,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'OSVDB', '26177' ],
 					[ 'CVE', '2006-2447' ],
+					[ 'OSVDB', '26177' ],
 					[ 'BID', '18290' ],
 					[ 'URL', 'http://spamassassin.apache.org/advisories/cve-2006-2447.txt' ],
 				],
diff --git a/modules/exploits/unix/webapp/sphpblog_file_upload.rb b/modules/exploits/unix/webapp/sphpblog_file_upload.rb
index 1633422e51..55ea645a32 100644
--- a/modules/exploits/unix/webapp/sphpblog_file_upload.rb
+++ b/modules/exploits/unix/webapp/sphpblog_file_upload.rb
@@ -35,9 +35,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					['CVE', '2005-2733'],
 					['OSVDB', '19012'],
 					['BID', '14667'],
-					['CVE', '2005-2733'],
 					['URL', 'http://www.milw0rm.com/exploits/1191'],
 				],
 			'Privileged'     => false,
@@ -239,4 +239,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		cmd_shell(cmdpath)
 		delete_file(cmdpath)	
 	end
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb b/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb
index c306f1520b..c26cc5e139 100644
--- a/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb
+++ b/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb
@@ -39,6 +39,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         => [ 'Nicob <nicob[at]nicob.net>' ],
 			'References'     => 
 				[
+				    	['CVE', '2003-0990'],
+					['OSVDB', '3178'],
 					['URL', 'http://lists.immunitysec.com/pipermail/dailydave/2007-July/004456.html'],
 					['URL', 'http://labs.idefense.com/intelligence/vulnerabilities/display.php?id=330'],
 					['URL', 'http://www.wslabi.com/wabisabilabi/initPublishedBid.do?'],
diff --git a/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb b/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb
index cba2cfba40..7b1e365b2d 100644
--- a/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb
+++ b/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb
@@ -25,9 +25,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					['CVE', '2007-5423'],
 					['OSVDB', '40478'],
 					['BID', '26006'],
-					['CVE', '2007-5423'],
 					['MIL', '4525'],
 				],
 			'Privileged'     => false,
diff --git a/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb b/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
index 820916105c..d0bfa74a3d 100644
--- a/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
+++ b/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
@@ -27,9 +27,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					['CVE', '2006-4602'],
 					['OSVDB', '28456'],
 					['BID', '19819'],
-					['CVE', '2006-4602'],
 					['MIL', '2288'],
 					['URL', 'http://secunia.com/advisories/21733/'],
 				],
diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb
index 02b88e183c..e77dd6c850 100644
--- a/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb
@@ -30,8 +30,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '22639'],
 					['CVE', '2007-1070'],
+					['OSVDB', '33042'],
+					['BID', '22639'],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -81,4 +82,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb
index 2eb9903ccd..8633862026 100644
--- a/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb
@@ -30,8 +30,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '23868'],
 					['CVE', '2007-2508'],
+					['OSVDB', '35790'],
+					['BID', '23868'],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -82,4 +83,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
index 89e30551af..11afb698a4 100644
--- a/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
@@ -30,8 +30,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					['BID', '23866'],
 					['CVE', '2007-2508'],
+					['OSVDB', '35789'],
+					['BID', '23866'],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -81,4 +82,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/backupexec/name_service.rb b/modules/exploits/windows/backupexec/name_service.rb
index 7472ac1622..c3d09ea5c3 100644
--- a/modules/exploits/windows/backupexec/name_service.rb
+++ b/modules/exploits/windows/backupexec/name_service.rb
@@ -40,9 +40,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2004-1172'],
 					[ 'OSVDB', '12418'],
 					[ 'BID', '11974'],
-					[ 'CVE', '2004-1172'],
 					[ 'URL', 'http://www.idefense.com/application/poi/display?id=169&type=vulnerabilities'],
 					[ 'MIL', '10'],
 
@@ -147,4 +147,4 @@ __END__
 0000002C  4E                dec esi
 0000002D  85F6              test esi,esi
 0000002F  75E1              jnz 0x12
-00000031  FFD7              call edi
\ No newline at end of file
+00000031  FFD7              call edi
diff --git a/modules/exploits/windows/backupexec/remote_agent.rb b/modules/exploits/windows/backupexec/remote_agent.rb
index fa9c390981..a4aa0f631c 100644
--- a/modules/exploits/windows/backupexec/remote_agent.rb
+++ b/modules/exploits/windows/backupexec/remote_agent.rb
@@ -33,8 +33,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '14022'],
 					[ 'CVE', '2005-0773'],
+					[ 'OSVDB', '17624'],
+					[ 'BID', '14022'],
 					[ 'URL', 'http://www.idefense.com/application/poi/display?id=272&type=vulnerabilities'],
 					[ 'URL', 'http://seer.support.veritas.com/docs/276604.htm'],
 					[ 'MIL', '9'],
@@ -135,4 +136,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb b/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
index 96b5dbcdbf..430bbc919f 100644
--- a/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
+++ b/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
@@ -25,8 +25,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
-					[ 'MSB', 'MS08-041' ],
 					[ 'CVE', '2008-2463' ],
+					[ 'OSVDB', '46749'],
+					[ 'MSB', 'MS08-041' ],
 					[ 'BID', '30114' ],
 				],
 			'Payload'        =>
diff --git a/modules/exploits/windows/browser/nis2004_get.rb b/modules/exploits/windows/browser/nis2004_get.rb
index 231988edaa..4d48ade2e2 100644
--- a/modules/exploits/windows/browser/nis2004_get.rb
+++ b/modules/exploits/windows/browser/nis2004_get.rb
@@ -31,6 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[
 					[ 'CVE', '2007-1689' ],
+					[ 'OSVDB', '36164'],
 					[ 'URL', 'http://securityresponse.symantec.com/avcenter/security/Content/2007.05.16.html' ],
 				],
 			'DefaultOptions' =>
@@ -86,4 +87,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/softartisans_getdrivename.rb b/modules/exploits/windows/browser/softartisans_getdrivename.rb
index 8c3dd4bf47..49d3b46a5e 100644
--- a/modules/exploits/windows/browser/softartisans_getdrivename.rb
+++ b/modules/exploits/windows/browser/softartisans_getdrivename.rb
@@ -25,8 +25,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
-					[ 'US-CERT-VU', '914785' ],
 					[ 'CVE', '2007-1682' ],
+					[ 'OSVDB', '47794' ],
+					[ 'US-CERT-VU', '914785' ],
 					[ 'BID', '30826' ],
 				],
 			'DefaultOptions' =>
@@ -116,4 +117,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/sonicwall_addrouteentry.rb b/modules/exploits/windows/browser/sonicwall_addrouteentry.rb
index 1b8d8ea2d6..ba9495df87 100644
--- a/modules/exploits/windows/browser/sonicwall_addrouteentry.rb
+++ b/modules/exploits/windows/browser/sonicwall_addrouteentry.rb
@@ -30,6 +30,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+					[ 'CVE', '2007-5603'],
+					[ 'OSVDB', '39069'],
 					[ 'URL', 'http://www.sec-consult.com/303.html' ],
 				],
 			'DefaultOptions' =>
@@ -92,4 +94,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/symantec_appstream_unsafe.rb b/modules/exploits/windows/browser/symantec_appstream_unsafe.rb
index 2b64a68f9f..129a8919a3 100644
--- a/modules/exploits/windows/browser/symantec_appstream_unsafe.rb
+++ b/modules/exploits/windows/browser/symantec_appstream_unsafe.rb
@@ -26,6 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[
 					[ 'CVE', '2008-4388' ],
+					[ 'OSVDB', '51410' ],
 				],
 			'Payload'        =>
 				{
diff --git a/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb b/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
index 671f6740f7..e674b99372 100644
--- a/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
+++ b/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
@@ -28,6 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[
 					[ 'CVE', 'CVE-2007-6016' ],
+					[ 'OSVDB', '42358'],
 					[ 'BID', '26904' ],
 					[ 'URL', 'http://secunia.com/advisories/27885/' ],
 				],
@@ -125,4 +126,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/trendmicro_officescan.rb b/modules/exploits/windows/browser/trendmicro_officescan.rb
index 71ee97df92..89fd9caf70 100644
--- a/modules/exploits/windows/browser/trendmicro_officescan.rb
+++ b/modules/exploits/windows/browser/trendmicro_officescan.rb
@@ -31,6 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     => 
 				[
 					[ 'CVE', '2007-0325' ],
+					[ 'OSVDB', '33040' ],
 					[ 'BID', '22585' ],
 				],
 			'DefaultOptions' =>
@@ -92,4 +93,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/tumbleweed_filetransfer.rb b/modules/exploits/windows/browser/tumbleweed_filetransfer.rb
index fc5d3638ea..df168b0161 100644
--- a/modules/exploits/windows/browser/tumbleweed_filetransfer.rb
+++ b/modules/exploits/windows/browser/tumbleweed_filetransfer.rb
@@ -32,6 +32,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+				    	[ 'CVE', '2008-1724'],
+					[ 'OSVDB', '44252'],
 					[ 'URL', 'http://www.aushack.com/200708-tumbleweed.txt' ],
 				],
 			'DefaultOptions' =>
@@ -90,4 +92,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler(cli)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/browser/verypdf_pdfview.rb b/modules/exploits/windows/browser/verypdf_pdfview.rb
index ec64edb9cd..2a03444b2b 100644
--- a/modules/exploits/windows/browser/verypdf_pdfview.rb
+++ b/modules/exploits/windows/browser/verypdf_pdfview.rb
@@ -25,6 +25,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+				    	[ 'CVE', '2008-5492'],
+					[ 'OSVDB', '49871'],
 					[ 'BID','32313' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/fileformat/sascam_get.rb b/modules/exploits/windows/fileformat/sascam_get.rb
index cf7e3afe0f..6c4d0b70a2 100644
--- a/modules/exploits/windows/fileformat/sascam_get.rb
+++ b/modules/exploits/windows/fileformat/sascam_get.rb
@@ -26,6 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+					[ 'OSVDB', '55945'],
 					[ 'BID','33053' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/fileformat/ursoft_w32dasm.rb b/modules/exploits/windows/fileformat/ursoft_w32dasm.rb
index 7a33dd9fda..336c2318e7 100644
--- a/modules/exploits/windows/fileformat/ursoft_w32dasm.rb
+++ b/modules/exploits/windows/fileformat/ursoft_w32dasm.rb
@@ -31,8 +31,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2005-0308' ],
-					[ 'BID', '12352' ],
 					[ 'OSVDB', '13169' ],
+					[ 'BID', '12352' ],
 					[ 'URL', 'http://aluigi.altervista.org/adv/w32dasmbof-adv.txt' ],
 				],
 			'DefaultOptions' =>
diff --git a/modules/exploits/windows/ftp/servu_mdtm.rb b/modules/exploits/windows/ftp/servu_mdtm.rb
index 83f7dbfc62..f0df5a338c 100644
--- a/modules/exploits/windows/ftp/servu_mdtm.rb
+++ b/modules/exploits/windows/ftp/servu_mdtm.rb
@@ -40,13 +40,13 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2004-0330'],
 					[ 'OSVDB', '4073'],
 					[ 'URL', 'http://archives.neohapsis.com/archives/bugtraq/2004-02/0654.html'],
 					[ 'URL', 'http://www.cnhonker.com/advisory/serv-u.mdtm.txt'],
 					[ 'URL', 'http://www.cnhonker.com/index.php?module=releases&act=view&type=3&id=54'],
 					[ 'MIL', '59'],
 					[ 'BID', '9751'],
-					[ 'CVE', '2004-0330'],
 
 				],
 			'Privileged'     => false,
@@ -198,4 +198,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		return (res and res =~ /^500/) ? true : false
 	end	
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/ftp/slimftpd_list_concat.rb b/modules/exploits/windows/ftp/slimftpd_list_concat.rb
index 09b6b0a526..ff1c5c2cfa 100644
--- a/modules/exploits/windows/ftp/slimftpd_list_concat.rb
+++ b/modules/exploits/windows/ftp/slimftpd_list_concat.rb
@@ -33,6 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2005-2373'],
 					[ 'OSVDB', '18172'],
 					[ 'BID', '14339'],
 					[ 'MIL', '92'],
@@ -77,4 +78,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/ftp/wftpd_size.rb b/modules/exploits/windows/ftp/wftpd_size.rb
index 7fc875261a..68ea727cdb 100644
--- a/modules/exploits/windows/ftp/wftpd_size.rb
+++ b/modules/exploits/windows/ftp/wftpd_size.rb
@@ -29,8 +29,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '19617' ],
 					[ 'CVE', '2006-4318' ],
+					[ 'OSVDB', '28134' ],
+					[ 'BID', '19617' ],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -69,4 +70,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/games/ut2004_secure.rb b/modules/exploits/windows/games/ut2004_secure.rb
index 7b92aaf0c5..32df52ba93 100644
--- a/modules/exploits/windows/games/ut2004_secure.rb
+++ b/modules/exploits/windows/games/ut2004_secure.rb
@@ -41,6 +41,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+				    	[ 'CVE', '2004-0608'],
 					[ 'OSVDB', '7217'],
 					[ 'BID', '10570'],
 					[ 'MIL', '73'],
@@ -119,4 +120,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		return Exploit::CheckCode::Safe
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/savant_31_overflow.rb b/modules/exploits/windows/http/savant_31_overflow.rb
index 880c3d8c33..808a24b50f 100644
--- a/modules/exploits/windows/http/savant_31_overflow.rb
+++ b/modules/exploits/windows/http/savant_31_overflow.rb
@@ -31,9 +31,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'       => '$Revision$',
 			'References'    =>
 			[
-				[ 'BID', '5686' ],
 				[ 'CVE', '2002-1120' ],
 				[ 'OSVDB', '9829' ],
+				[ 'BID', '5686' ],
 				[ 'URL', 'http://www.milw0rm.com/exploits/787' ],
 			],
 			'Privileged'		=> false,
@@ -121,4 +121,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		handler
 		disconnect
 	end
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/steamcast_useragent.rb b/modules/exploits/windows/http/steamcast_useragent.rb
index 7602a940a5..270c777e28 100644
--- a/modules/exploits/windows/http/steamcast_useragent.rb
+++ b/modules/exploits/windows/http/steamcast_useragent.rb
@@ -18,9 +18,9 @@ class Metasploit3 < Msf::Exploit::Remote
 
 	def initialize(info = {})
 		super(update_info(info,	
-			'Name'           => 'Steamcast <= 0.9.75 HTTP User-Agent Buffer Overflow',
+			'Name'           => 'Streamcast <= 0.9.75 HTTP User-Agent Buffer Overflow',
 			'Description'    => %q{
-					This module exploits a stack overflow in Steamcast <= 0.9.75. By sending
+					This module exploits a stack overflow in Streamcast <= 0.9.75. By sending
 					an overly long User-Agent in a HTTP GET request, an attacker may be able to
 					execute arbitrary code.
 			},
@@ -32,8 +32,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'OSVDB', '42670' ],
 					[ 'CVE', '2008-0550' ],
+					[ 'OSVDB', '42670' ],
 					[ 'URL', 'http://aluigi.altervista.org/adv/steamcazz-adv.txt'],
 					# [ 'BID', '' ], # No entry as yet
 				],
diff --git a/modules/exploits/windows/http/sybase_easerver.rb b/modules/exploits/windows/http/sybase_easerver.rb
index 0ce1c29907..2b0cb2b738 100644
--- a/modules/exploits/windows/http/sybase_easerver.rb
+++ b/modules/exploits/windows/http/sybase_easerver.rb
@@ -31,6 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+				    	[ 'OSVDB', '17996'],
 					[ 'BID', '14287'],
 				],
 			'Privileged'     => false,
@@ -88,4 +89,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		sleep(4)
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/http/trackercam_phparg_overflow.rb b/modules/exploits/windows/http/trackercam_phparg_overflow.rb
index 128b451559..63d0433576 100644
--- a/modules/exploits/windows/http/trackercam_phparg_overflow.rb
+++ b/modules/exploits/windows/http/trackercam_phparg_overflow.rb
@@ -35,9 +35,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
+					[ 'CVE', '2005-0478'],
 					[ 'OSVDB', '13953'],
 					[ 'OSVDB', '13955'],
-					[ 'CVE', '2005-0478'],
 					[ 'BID', '12592'],
 					[ 'URL', 'http://aluigi.altervista.org/adv/tcambof-adv.txt'],
 					[ 'MIL', '69'],
@@ -159,4 +159,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		end	
 	end
 	
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/license/sentinel_lm7_udp.rb b/modules/exploits/windows/license/sentinel_lm7_udp.rb
index e0764b1d6d..55924e9be7 100644
--- a/modules/exploits/windows/license/sentinel_lm7_udp.rb
+++ b/modules/exploits/windows/license/sentinel_lm7_udp.rb
@@ -33,9 +33,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-					[ 'BID', '12742'],
 					[ 'CVE', '2005-0353'],
 					[ 'OSVDB', '14605'],
+					[ 'BID', '12742'],
 					[ 'MIL', '58'],
 
 				],
@@ -103,4 +103,4 @@ class Metasploit3 < Msf::Exploit::Remote
 	end
 
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/misc/shixxnote_font.rb b/modules/exploits/windows/misc/shixxnote_font.rb
index 13fdf55da9..76ffec8f6a 100644
--- a/modules/exploits/windows/misc/shixxnote_font.rb
+++ b/modules/exploits/windows/misc/shixxnote_font.rb
@@ -31,7 +31,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[ 
-					['CVE', '2004-1595'], ['BID', '11409'],
+					['CVE', '2004-1595'],
+					['OSVDB', '10721'],
+					['BID', '11409'],
 				],
 			'DefaultOptions' =>
 				{
@@ -84,4 +86,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/misc/tiny_identd_overflow.rb b/modules/exploits/windows/misc/tiny_identd_overflow.rb
index f978057756..2922abce7f 100644
--- a/modules/exploits/windows/misc/tiny_identd_overflow.rb
+++ b/modules/exploits/windows/misc/tiny_identd_overflow.rb
@@ -29,6 +29,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[
+				    	['CVE', '2007-2711'],
+					['OSVDB', '36053'],
 					['BID', '23981'],
 				],
 			'Payload'        =>
@@ -71,4 +73,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/pop3/seattlelab_pass.rb b/modules/exploits/windows/pop3/seattlelab_pass.rb
index 7a2f6d40bb..e90e115d6a 100644
--- a/modules/exploits/windows/pop3/seattlelab_pass.rb
+++ b/modules/exploits/windows/pop3/seattlelab_pass.rb
@@ -56,7 +56,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				[
 					['OSVDB', '12002'],
 					['BID', '7519'],
-					['MIL', '57'],
+					['MIL', '638'],
 				],
 			'Privileged'     => true,
 			'DefaultOptions' =>
@@ -116,4 +116,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb b/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb
index 984cbbc339..7f361fd378 100644
--- a/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb
+++ b/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb
@@ -26,6 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2009-1350' ],
+					[ 'OSVDB', '53351' ],
 					[ 'BID', '34400' ],
 					[ 'URL', 'http://www.reversemode.com/index.php?option=com_content&task=view&id=62&Itemid=1' ],
 				],
diff --git a/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb b/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb
index dcb26b103c..b2b10f73bf 100644
--- a/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb
+++ b/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb
@@ -29,10 +29,10 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'       => '$Revision$',
 			'References'    =>
 			[
-				[ 'BID', '11535' ],
 				[ 'CVE', '2004-1638' ],
-				[ 'URL', 'http://milw0rm.com/exploits/598' ],
 				[ 'OSVDB', '11174' ],
+				[ 'BID', '11535' ],
+				[ 'URL', 'http://milw0rm.com/exploits/598' ],
 			],         
 			'Privileged'		=> true,
 			'DefaultOptions'	=>
@@ -85,4 +85,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/smtp/wmailserver.rb b/modules/exploits/windows/smtp/wmailserver.rb
index 9b504b5cc1..5220025551 100644
--- a/modules/exploits/windows/smtp/wmailserver.rb
+++ b/modules/exploits/windows/smtp/wmailserver.rb
@@ -30,6 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2005-2287' ],
+					[ 'OSVDB', '17883' ],
 					[ 'BID', '14213' ],
 				],
 			'DefaultOptions' =>
@@ -69,4 +70,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/ssh/securecrt_ssh1.rb b/modules/exploits/windows/ssh/securecrt_ssh1.rb
index 5a3ada3d76..90ebf58701 100644
--- a/modules/exploits/windows/ssh/securecrt_ssh1.rb
+++ b/modules/exploits/windows/ssh/securecrt_ssh1.rb
@@ -31,8 +31,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[ 
-					[ 'BID', '5287' ],
 					[ 'CVE', '2002-1059' ],
+					[ 'OSVDB', '4991' ],
+					[ 'BID', '5287' ],
 				],
 			'DefaultOptions' =>
 				{
@@ -74,4 +75,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/tftp/tftpd32_long_filename.rb b/modules/exploits/windows/tftp/tftpd32_long_filename.rb
index 62b2b5c201..3757544979 100644
--- a/modules/exploits/windows/tftp/tftpd32_long_filename.rb
+++ b/modules/exploits/windows/tftp/tftpd32_long_filename.rb
@@ -30,6 +30,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[ 
+				    	['CVE', '2002-2226'],
+					['OSVDB', '45903'],
 					['BID', '6199'],
 				],
 			'DefaultOptions' =>
@@ -84,4 +86,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect_udp		
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/tftp/tftpdwin_long_filename.rb b/modules/exploits/windows/tftp/tftpdwin_long_filename.rb
index 19b20349b0..778a6417e7 100644
--- a/modules/exploits/windows/tftp/tftpdwin_long_filename.rb
+++ b/modules/exploits/windows/tftp/tftpdwin_long_filename.rb
@@ -28,9 +28,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[ 
-					[ 'BID', '20131' ],
-					[ 'OSVDB', '29032' ],
 					[ 'CVE', '2006-4948' ],
+					[ 'OSVDB', '29032' ],
+					[ 'BID', '20131' ],
 					[ 'URL', 'http://www.milw0rm.com/exploits/3132' ],
 				],
 			'DefaultOptions' =>
@@ -70,4 +70,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		disconnect_udp
 	end
 
-end
\ No newline at end of file
+end
diff --git a/modules/exploits/windows/vnc/ultravnc_client.rb b/modules/exploits/windows/vnc/ultravnc_client.rb
index 987d227228..f58ccdc3d5 100644
--- a/modules/exploits/windows/vnc/ultravnc_client.rb
+++ b/modules/exploits/windows/vnc/ultravnc_client.rb
@@ -27,8 +27,9 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     => 
 				[ 
-					[ 'BID', '17378' ],
 					[ 'CVE', '2006-1652' ],
+					[ 'OSVDB', '24456' ],
+					[ 'BID', '17378' ],
 				],
 			'DefaultOptions' =>
 				{
@@ -81,4 +82,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		service.close_client(client)
 	end
 
-end
\ No newline at end of file
+end