diff --git a/scripts/jdwp-exec.nse b/scripts/jdwp-exec.nse
index 6c4ccf768..ef779b281 100644
--- a/scripts/jdwp-exec.nse
+++ b/scripts/jdwp-exec.nse
@@ -34,7 +34,7 @@ accepts a shell command as its argument.
 
 author = "Aleksandar Nikolic"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"safe","discovery"}
+categories = {"exploit","intrusive"}
 
 portrule = function(host, port)
         -- JDWP will close the port if there is no valid handshake within 2
diff --git a/scripts/jdwp-inject.nse b/scripts/jdwp-inject.nse
index 81b622cfe..dbd5d9f5f 100644
--- a/scripts/jdwp-inject.nse
+++ b/scripts/jdwp-inject.nse
@@ -28,7 +28,7 @@ See nselib/data/jdwp-class/README for more.
 
 author = "Aleksandar Nikolic"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"safe","discovery"}
+categories = {"exploit","intrusive"}
 
 portrule = function(host, port)
         -- JDWP will close the port if there is no valid handshake within 2
diff --git a/scripts/script.db b/scripts/script.db
index 58c4f9373..bc2d16c2c 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -230,9 +230,9 @@ Entry { filename = "irc-unrealircd-backdoor.nse", categories = { "exploit", "int
 Entry { filename = "iscsi-brute.nse", categories = { "brute", "intrusive", } }
 Entry { filename = "iscsi-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "isns-info.nse", categories = { "discovery", "safe", } }
-Entry { filename = "jdwp-exec.nse", categories = { "discovery", "safe", } }
+Entry { filename = "jdwp-exec.nse", categories = { "exploit", "intrusive", } }
 Entry { filename = "jdwp-info.nse", categories = { "default", "discovery", "safe", } }
-Entry { filename = "jdwp-inject.nse", categories = { "discovery", "safe", } }
+Entry { filename = "jdwp-inject.nse", categories = { "exploit", "intrusive", } }
 Entry { filename = "jdwp-version.nse", categories = { "version", } }
 Entry { filename = "krb5-enum-users.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "ldap-brute.nse", categories = { "brute", "intrusive", } }