diff --git a/modules/auxiliary/admin/http/intersil_pass_reset.rb b/modules/auxiliary/admin/http/intersil_pass_reset.rb
index e397eb9f3f..335c0e050d 100644
--- a/modules/auxiliary/admin/http/intersil_pass_reset.rb
+++ b/modules/auxiliary/admin/http/intersil_pass_reset.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Auxiliary
       'References'     =>
         [
           [ 'BID', '25676'],
-          [ 'URL', 'http://packetstormsecurity.org/files/59347/boa-bypass.txt.html']
+          [ 'PACKETSTORM', '59347']
         ],
       'DisclosureDate' => 'Sep 10 2007'))
 
diff --git a/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb b/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb
index 7b44f004e9..6c8259c09f 100644
--- a/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb
+++ b/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb
@@ -22,7 +22,7 @@ class Metasploit3 < Msf::Auxiliary
       'References'     =>
         [
           ['WPVDB', '8107'],
-          ['URL', 'https://packetstormsecurity.com/files/132750/']
+          ['PACKETSTORM', '132750']
         ],
       'Author'         =>
         [
diff --git a/modules/exploits/unix/webapp/cakephp_cache_corruption.rb b/modules/exploits/unix/webapp/cakephp_cache_corruption.rb
index 946c4ea726..045be447c2 100644
--- a/modules/exploits/unix/webapp/cakephp_cache_corruption.rb
+++ b/modules/exploits/unix/webapp/cakephp_cache_corruption.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
           [ 'OSVDB', '69352' ],
           [ 'CVE', '2010-4335' ],
           [ 'BID', '44852'  ],
-          [ 'URL', 'http://packetstormsecurity.org/files/view/95847/burnedcake.py.txt' ]
+          [ 'PACKETSTORM', '95847' ]
         ],
       'Privileged'     => false,
       'Platform'       => ['php'],
diff --git a/modules/exploits/unix/webapp/nagios_graph_explorer.rb b/modules/exploits/unix/webapp/nagios_graph_explorer.rb
index e911858220..44a9e6123d 100644
--- a/modules/exploits/unix/webapp/nagios_graph_explorer.rb
+++ b/modules/exploits/unix/webapp/nagios_graph_explorer.rb
@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           [ 'OSVDB', '83552' ],
           [ 'BID', '54263' ],
-          [ 'URL', 'http://packetstormsecurity.org/files/118497/Nagios-XI-Network-Monitor-2011R1.9-OS-Command-Injection.html' ]
+          [ 'PACKETSTORM', '118497' ]
         ],
       'Payload'        =>
         {
diff --git a/modules/exploits/unix/webapp/projectpier_upload_exec.rb b/modules/exploits/unix/webapp/projectpier_upload_exec.rb
index f00354ae63..402c9a0d33 100644
--- a/modules/exploits/unix/webapp/projectpier_upload_exec.rb
+++ b/modules/exploits/unix/webapp/projectpier_upload_exec.rb
@@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           ['OSVDB', '85881'],
           ['EDB', '21929'],
-          ['URL', 'http://packetstormsecurity.org/files/117070/ProjectPier-0.8.8-Shell-Upload.html']
+          ['PACKETSTORM', '117070']
         ],
       'Platform'       => %w{ linux php },
       'Targets'        =>
diff --git a/modules/exploits/windows/http/miniweb_upload_wbem.rb b/modules/exploits/windows/http/miniweb_upload_wbem.rb
index 3f5924d00e..23aa9083fa 100644
--- a/modules/exploits/windows/http/miniweb_upload_wbem.rb
+++ b/modules/exploits/windows/http/miniweb_upload_wbem.rb
@@ -38,7 +38,7 @@ class Metasploit3 < Msf::Exploit::Remote
         [
           ['OSVDB', '92198'],
           ['OSVDB', '92200'],
-          ['URL',   'http://dl.packetstormsecurity.net/1304-exploits/miniweb-shelltraversal.txt']
+          ['PACKETSTORM', '121168']
         ],
       'Payload'        =>
         {
diff --git a/tools/dev/msftidy.rb b/tools/dev/msftidy.rb
index 19b95e2053..1f17891ccd 100755
--- a/tools/dev/msftidy.rb
+++ b/tools/dev/msftidy.rb
@@ -210,7 +210,7 @@ class Msftidy
             warn("Please use 'US-CERT-VU' for '#{value}'")
           elsif value =~ /^https:\/\/wpvulndb\.com\/vulnerabilities\//
             warn("Please use 'WPVDB' for '#{value}'")
-          elsif value =~ /^http:\/\/packetstormsecurity\.com\/files\//
+          elsif value =~ /^https?:\/\/(?:[^\.]+\.)?packetstormsecurity\.(?:com|net|org)\//
             warn("Please use 'PACKETSTORM' for '#{value}'")
           end
         end