diff --git a/modules/exploits/linux/http/fritzbox_echo_exec.rb b/modules/exploits/linux/http/fritzbox_echo_exec.rb
index 4b9dacf359..a4612b7af9 100644
--- a/modules/exploits/linux/http/fritzbox_echo_exec.rb
+++ b/modules/exploits/linux/http/fritzbox_echo_exec.rb
@@ -28,6 +28,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          [ 'CVE', '2014-9727' ],
           [ 'OSVDB', '103289' ],
           [ 'BID', '65520' ],
           [ 'URL', 'http://www.kapple.de/?p=75' ],                       # vulnerability details with PoC
diff --git a/modules/exploits/multi/http/rails_secret_deserialization.rb b/modules/exploits/multi/http/rails_secret_deserialization.rb
index 95923d7e87..26aa1b66cb 100644
--- a/modules/exploits/multi/http/rails_secret_deserialization.rb
+++ b/modules/exploits/multi/http/rails_secret_deserialization.rb
@@ -111,6 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'  =>
         [
+          ['CVE', '2013-3709'],
           ['URL', 'http://robertheaton.com/2013/07/22/how-to-hack-a-rails-app-using-its-secret-token/']
         ],
       'DisclosureDate' => 'Apr 11 2013',
diff --git a/modules/exploits/multi/http/vbseo_proc_deutf.rb b/modules/exploits/multi/http/vbseo_proc_deutf.rb
index fc578f414c..caa2572add 100644
--- a/modules/exploits/multi/http/vbseo_proc_deutf.rb
+++ b/modules/exploits/multi/http/vbseo_proc_deutf.rb
@@ -23,6 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          ['CVE', '2012-5223'],
           ['OSVDB', '78508'],
           ['BID', '51647'],
           ['EDB', '18424']
diff --git a/modules/exploits/unix/webapp/basilic_diff_exec.rb b/modules/exploits/unix/webapp/basilic_diff_exec.rb
index d9f19b320d..7a89888d7c 100644
--- a/modules/exploits/unix/webapp/basilic_diff_exec.rb
+++ b/modules/exploits/unix/webapp/basilic_diff_exec.rb
@@ -25,6 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          [ 'CVE', '2012-3399' ],
           [ 'OSVDB', '83719' ],
           [ 'BID', '54234' ]
         ],
diff --git a/modules/exploits/unix/webapp/openemr_upload_exec.rb b/modules/exploits/unix/webapp/openemr_upload_exec.rb
index c97849eee9..7d3eeb32a5 100644
--- a/modules/exploits/unix/webapp/openemr_upload_exec.rb
+++ b/modules/exploits/unix/webapp/openemr_upload_exec.rb
@@ -27,6 +27,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'     =>
         [
+          [ 'CVE', '2009-4140' ],
           [ 'OSVDB', '90222' ],
           [ 'BID', '37314' ],
           [ 'EBD', '24492' ],
diff --git a/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb b/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb
index ca31628d09..9964cb09eb 100644
--- a/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb
@@ -41,6 +41,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'      =>
         [
+          ['CVE', '2014-9308'],
           ['OSVDB', '116806'],
           ['WPVDB', '7745']
         ],
diff --git a/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb b/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb
index 80df5c2929..76d8e5cdea 100644
--- a/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb
@@ -24,6 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          ['CVE', '2015-4133'],
           ['EDB', '36374'],
           ['OSVDB', '88853'],
           ['WPVDB', '7867']
diff --git a/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb b/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb
index 6ae1b10e05..2c72dbfd88 100644
--- a/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb
@@ -28,6 +28,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'     =>
         [
+          [ 'CVE', '2013-7409' ],
           [ 'BID', '62926' ],
           [ 'BID', '63896' ],
           [ 'EDB', '28855' ],
diff --git a/modules/exploits/windows/fileformat/bacnet_csv.rb b/modules/exploits/windows/fileformat/bacnet_csv.rb
index e5b8fea47d..3b06e6d009 100644
--- a/modules/exploits/windows/fileformat/bacnet_csv.rb
+++ b/modules/exploits/windows/fileformat/bacnet_csv.rb
@@ -21,6 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         => [ 'Jeremy Brown', 'MC' ],
       'References'     =>
         [
+          [ 'CVE', '2010-4740' ],
           [ 'OSVDB', '68096'],
           [ 'BID', '43289' ],
           [ 'URL', 'http://www.us-cert.gov/control_systems/pdf/ICSA-10-264-01.pdf' ],
diff --git a/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb b/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
index f9c0f711cd..514f0ab246 100644
--- a/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
@@ -23,6 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         => ['Rh0'],	# discovery and metasploit module
       'References'     =>
         [
+          ['CVE', '2011-5170'],
           ['OSVDB', '77453'],
           ['EDB', '18178']
         ],
diff --git a/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb b/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb
index e12655e425..aeb24a07fb 100644
--- a/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb
+++ b/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb
@@ -25,6 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'      =>
         [
+          ['CVE', '2011-5171'],
           ['BID', '50997'],
           ['OSVDB', '77600'],
           ['EDB', '18220'],
diff --git a/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb b/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb
index 5651182f92..1f088f2ce9 100644
--- a/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb
+++ b/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb
@@ -20,6 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         => [ 'MC' ],
       'References'     =>
         [
+          [ 'CVE', '2012-2515' ],
           [ 'OSVDB', '58423'],
           [ 'BID', '36546' ],
         ],
diff --git a/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb b/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
index 5dd3e468d7..5a3346cdc1 100644
--- a/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
+++ b/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
@@ -27,6 +27,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'     =>
         [
+          [ 'CVE', '2011-5165' ],
           [ 'OSVDB', '63349' ],
           [ 'EDB', '11975' ], #Initial disclosure
           [ 'EDB', '17727' ] #This exploit is based on this poc
diff --git a/modules/exploits/windows/fileformat/microp_mppl.rb b/modules/exploits/windows/fileformat/microp_mppl.rb
index 2e56cb3be1..f6ebe6f7ff 100644
--- a/modules/exploits/windows/fileformat/microp_mppl.rb
+++ b/modules/exploits/windows/fileformat/microp_mppl.rb
@@ -21,6 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         => [ 'James Fitts <fitts.james[at]gmail.com>' ],
       'References'     =>
         [
+          [ 'CVE', '2010-5299' ],
           [ 'OSVDB', '73627'],
           [ 'EDB', '14720' ],
         ],
diff --git a/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb b/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
index 7e51da57d5..a745e03757 100644
--- a/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
+++ b/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
@@ -25,6 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'     =>
         [
+          [ 'CVE', '2009-1330' ],
           [ 'OSVDB', '78078' ],
           [ 'EDB', '14373' ],
           [ 'BID', '34514' ]
diff --git a/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb b/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb
index fd7b9107b8..0e56baadc5 100644
--- a/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb
+++ b/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb
@@ -25,6 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'      =>
         [
+          [ 'CVE', '2009-1641' ],
           [ 'OSVDB', '81487' ],
           [ 'EDB', '11957' ],
           [ 'BID', '34864' ]
diff --git a/modules/exploits/windows/ftp/pcman_put.rb b/modules/exploits/windows/ftp/pcman_put.rb
index 62b21be60f..a98d511490 100644
--- a/modules/exploits/windows/ftp/pcman_put.rb
+++ b/modules/exploits/windows/ftp/pcman_put.rb
@@ -24,6 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          [ 'CVE', '2013-4730' ],
           [ 'EDB',   '37731'],
           [ 'OSVDB',   '94624']
         ],
diff --git a/modules/exploits/windows/ftp/pcman_stor.rb b/modules/exploits/windows/ftp/pcman_stor.rb
index 0499646bf2..9c570f55cd 100644
--- a/modules/exploits/windows/ftp/pcman_stor.rb
+++ b/modules/exploits/windows/ftp/pcman_stor.rb
@@ -25,6 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          [ 'CVE', '2013-4730' ],
           [ 'OSVDB', '94624'],
           [ 'EDB',   '27703']
         ],
diff --git a/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb b/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb
index 408876ad31..58d156b3ba 100644
--- a/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb
+++ b/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb
@@ -26,6 +26,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          [ 'CVE', '2012-2329' ],
           [ 'OSVDB', '95819'],
           [ 'BID', '53455'],
           [ 'ZDI', '13-178' ],
diff --git a/modules/exploits/windows/http/zenworks_uploadservlet.rb b/modules/exploits/windows/http/zenworks_uploadservlet.rb
index b64a4d4ea1..1d8dfa11ff 100644
--- a/modules/exploits/windows/http/zenworks_uploadservlet.rb
+++ b/modules/exploits/windows/http/zenworks_uploadservlet.rb
@@ -23,6 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          [ 'CVE', '2010-5324' ],
           [ 'OSVDB', '63412' ],
           [ 'BID', '39114' ],
           [ 'ZDI', '10-078' ],
diff --git a/modules/exploits/windows/local/novell_client_nwfs.rb b/modules/exploits/windows/local/novell_client_nwfs.rb
index 44e455f176..fe1e798bd9 100644
--- a/modules/exploits/windows/local/novell_client_nwfs.rb
+++ b/modules/exploits/windows/local/novell_client_nwfs.rb
@@ -49,6 +49,7 @@ class MetasploitModule < Msf::Exploit::Local
         ],
       'References'    =>
         [
+          [ 'CVE', '2008-3158' ],
           [ 'OSVDB', '46578' ],
           [ 'BID', '30001' ]
         ],