diff --git a/scripts/broadcast-ping.nse b/scripts/broadcast-ping.nse
index 6ea209800..aebedb39b 100755
--- a/scripts/broadcast-ping.nse
+++ b/scripts/broadcast-ping.nse
@@ -45,7 +45,7 @@ is 0. The payload is consisted of random bytes.
 
 author = "Gorjan Petrovski"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"discovery","safe"}
+categories = {"discovery","safe","broadcast"}
 
 require "nmap"
 require "stdnse"
diff --git a/scripts/script.db b/scripts/script.db
index ae2035204..2930ae22d 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -20,7 +20,7 @@ Entry { filename = "broadcast-listener.nse", categories = { "safe", } }
 Entry { filename = "broadcast-ms-sql-discover.nse", categories = { "broadcast", "safe", } }
 Entry { filename = "broadcast-netbios-master-browser.nse", categories = { "broadcast", "safe", } }
 Entry { filename = "broadcast-novell-locate.nse", categories = { "broadcast", "safe", } }
-Entry { filename = "broadcast-ping.nse", categories = { "discovery", "safe", } }
+Entry { filename = "broadcast-ping.nse", categories = { "broadcast", "discovery", "safe", } }
 Entry { filename = "broadcast-upnp-info.nse", categories = { "broadcast", "safe", } }
 Entry { filename = "broadcast-wsdd-discover.nse", categories = { "broadcast", "safe", } }
 Entry { filename = "citrix-brute-xml.nse", categories = { "auth", "intrusive", } }
@@ -226,9 +226,9 @@ Entry { filename = "ssl-known-key.nse", categories = { "discovery", "safe", "vul
 Entry { filename = "sslv2.nse", categories = { "default", "safe", } }
 Entry { filename = "stuxnet-detect.nse", categories = { "discovery", "intrusive", } }
 Entry { filename = "svn-brute.nse", categories = { "auth", "intrusive", } }
-Entry { filename = "targets-ipv6-multicast-echo.nse", categories = { "discovery", } }
-Entry { filename = "targets-ipv6-multicast-invalid-dst.nse", categories = { "discovery", } }
-Entry { filename = "targets-ipv6-multicast-slaac.nse", categories = { "discovery", } }
+Entry { filename = "targets-ipv6-multicast-echo.nse", categories = { "broadcast", "discovery", } }
+Entry { filename = "targets-ipv6-multicast-invalid-dst.nse", categories = { "broadcast", "discovery", } }
+Entry { filename = "targets-ipv6-multicast-slaac.nse", categories = { "broadcast", "discovery", } }
 Entry { filename = "targets-sniffer.nse", categories = { "broadcast", "discovery", "safe", } }
 Entry { filename = "targets-traceroute.nse", categories = { "discovery", "safe", } }
 Entry { filename = "telnet-brute.nse", categories = { "auth", "intrusive", } }
diff --git a/scripts/targets-ipv6-multicast-echo.nse b/scripts/targets-ipv6-multicast-echo.nse
index dfab2fde5..e5b3b15fe 100644
--- a/scripts/targets-ipv6-multicast-echo.nse
+++ b/scripts/targets-ipv6-multicast-echo.nse
@@ -17,7 +17,7 @@ author = "David and Weilin"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
-categories = {"discovery"}
+categories = {"discovery","broadcast"}
 
 require 'nmap'
 require 'target'
diff --git a/scripts/targets-ipv6-multicast-invalid-dst.nse b/scripts/targets-ipv6-multicast-invalid-dst.nse
index 047dd82bd..5b5e59803 100644
--- a/scripts/targets-ipv6-multicast-invalid-dst.nse
+++ b/scripts/targets-ipv6-multicast-invalid-dst.nse
@@ -18,7 +18,7 @@ author = "David and Weilin"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
-categories = {"discovery"}
+categories = {"discovery","broadcast"}
 
 require 'nmap'
 require 'target'
diff --git a/scripts/targets-ipv6-multicast-slaac.nse b/scripts/targets-ipv6-multicast-slaac.nse
index a7516a0bf..5f78a3ef5 100644
--- a/scripts/targets-ipv6-multicast-slaac.nse
+++ b/scripts/targets-ipv6-multicast-slaac.nse
@@ -27,7 +27,7 @@ author = "David and Weilin"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
-categories = {"discovery"}
+categories = {"discovery","broadcast"}
 
 require 'nmap'
 require 'target'