diff --git a/CHANGELOG b/CHANGELOG
index c32015db6..06f991787 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
-o [NSE] Added p2p-dropbox-listener.nse, which listens for Dropbox
-  LanSync broadcasts and can optionally add discovered hosts to the
-  scan queue. [Ron Bowes, Mak Kolybabi, Andrew Orr, Russ Tait Milne]
+o [NSE] Added broadcast-dropbox-listener.nse, which listens for
+  Dropbox LanSync broadcasts and can optionally add discovered hosts
+  to the scan queue. [Ron Bowes, Mak Kolybabi, Andrew Orr, Russ Tait
+  Milne]
 
 o [NSE] Created a new "broadcast" script category. This is the new
   home for the broadcast-* scripts, which do discovery by broadcasting
diff --git a/scripts/p2p-dropbox-listener.nse b/scripts/broadcast-dropbox-listener.nse
similarity index 100%
rename from scripts/p2p-dropbox-listener.nse
rename to scripts/broadcast-dropbox-listener.nse
diff --git a/scripts/script.db b/scripts/script.db
index 635e11599..3a860241b 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -7,6 +7,7 @@ Entry { filename = "auth-owners.nse", categories = { "default", "safe", } }
 Entry { filename = "auth-spoof.nse", categories = { "malware", "safe", } }
 Entry { filename = "banner.nse", categories = { "discovery", "safe", } }
 Entry { filename = "broadcast-dns-service-discovery.nse", categories = { "broadcast", "safe", } }
+Entry { filename = "broadcast-dropbox-listener.nse", categories = { "discovery", "safe", } }
 Entry { filename = "broadcast-ms-sql-discover.nse", categories = { "broadcast", } }
 Entry { filename = "broadcast-upnp-info.nse", categories = { "broadcast", "safe", } }
 Entry { filename = "broadcast-wsdd-discover.nse", categories = { "broadcast", "safe", } }
@@ -113,7 +114,6 @@ Entry { filename = "oracle-brute.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "oracle-enum-users.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "oracle-sid-brute.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "p2p-conficker.nse", categories = { "default", "safe", } }
-Entry { filename = "p2p-dropbox-listener.nse", categories = { "discovery", "safe", } }
 Entry { filename = "path-mtu.nse", categories = { "discovery", "safe", } }
 Entry { filename = "pgsql-brute.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "pjl-ready-message.nse", categories = { "intrusive", } }