diff --git a/CHANGELOG b/CHANGELOG
index bf1899b1b..c8bb64087 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,27 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+4.49RC6
+
+o NSE scripts can now be specifed by absolute path to the --script
+  option.  This was supposed to work before, but didn't. [David]
+
+o Insert a path separator in returned paths in init_scandir on
+  Windows.  Otherwise options such as "--scripts=scripts" (where
+  scripts is a directory) were failing with error messages about being
+  unable to access things like "C:\Nmap\scriptsanonFTP.nse" (should be
+  "C:\Nmap\scripts\anonFTP.nse"). [David]
+
+o Add some "local" declarations to xamppDefaultPass.nse to avoid
+  errors like: "SCRIPT ENGINE: [string "Global Access"]:1: Attempted
+  to change the global 'socket' ..." [David]
+
+o NSE "shortports" function now by default matches ports in the
+  "open|filtered" state as well as "open" ones. [Diman]
+
+o Nsock msevent_new and msevent_delete calls fixed to handle NULL I/O
+  descriptors.  This should fix a reported bus error crash. [Diman]
+
+
 4.49RC5
 
 o Don't install the orphaned and incomplete Zenmap HTML documentation.
diff --git a/docs/nmap.1 b/docs/nmap.1
index 8888e2b6a..6038d3cf1 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -102,7 +102,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .sp
 .RS 4
 .nf
-Nmap 4\.49RC5 ( http://insecure\.org )
+Nmap 4\.49RC6 ( http://insecure\.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\.
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index b0f9592c3..868a162c7 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.49RC5 ( http://insecure.org )
+Nmap 4.49RC6 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/nmap.h b/nmap.h
index 50552ed38..90ab8f6a4 100644
--- a/nmap.h
+++ b/nmap.h
@@ -253,8 +253,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.49RC5"
-#define NMAP_NUM_VERSION "4.49.0.5"
+#define NMAP_VERSION "4.49RC6"
+#define NMAP_NUM_VERSION "4.49.0.6"
 #endif
 
 /* User configurable #defines: */