diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 4f0167396..f9a460680 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.85BETA10 ( http://nmap.org )
+Nmap 4.90RC2 ( http://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/nmap-services b/nmap-services
index 4934430b8..bd2595f3e 100644
--- a/nmap-services
+++ b/nmap-services
@@ -5923,7 +5923,7 @@ unknown	9893/udp	0.000330
 unknown	9894/udp	0.000330
 unknown	9897/udp	0.000661
 unknown	9898/tcp	0.000228
-sctp-tunneling	9899/sctp	0.000000	# SCTP Tunneling
+sctp-tunneling	9899/sctp	0.000000	# SCTP Tunneling (misconfiguration)
 iua	9900/tcp	0.000380	# IUA
 iua	9900/sctp	0.000000	# IUA
 unknown	9901/tcp	0.000076
diff --git a/nmap.h b/nmap.h
index e0b56da04..6dca3832c 100644
--- a/nmap.h
+++ b/nmap.h
@@ -252,8 +252,8 @@ void *realloc();
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
-#define NMAP_VERSION "4.85BETA10"
-#define NMAP_NUM_VERSION "4.85.0.10"
+#define NMAP_VERSION "4.90RC2"
+#define NMAP_NUM_VERSION "4.90.0.2"
 #endif
 
 /* User configurable #defines: */
diff --git a/scripts/script.db b/scripts/script.db
index 03422388f..990204486 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -25,7 +25,7 @@ Entry { filename = "mysql-info.nse", categories = { "default", "discovery", "saf
 Entry { filename = "nbstat.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "p2p-conficker.nse", categories = { "default", "safe", } }
 Entry { filename = "pop3-brute.nse", categories = { "auth", "intrusive", } }
-Entry { filename = "pop3-capabilities.nse", categories = { "default", } }
+Entry { filename = "pop3-capabilities.nse", categories = { "default", "discovery", } }
 Entry { filename = "pptp-version.nse", categories = { "version", } }
 Entry { filename = "realvnc-auth-bypass.nse", categories = { "default", "vuln", } }
 Entry { filename = "robots.txt.nse", categories = { "default", "discovery", "safe", } }