diff --git a/CHANGELOG b/CHANGELOG
index 8390fa4c0..38299e74f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
-
-4.22SOC4
+4.22SOC5
 
 o The Windows installer should actually install UMIT properly now.
 
+o Revert to an earlier (empty) umit.db as a problematic one was added
+  accidentally in 4.22SOC3 and SOC4. [Kris]
+
 o Fixed the UMIT portion of the Windows installer build system to
   detect certain heinous errors (like not being able to find Python)
   and bail out. [Kris]
diff --git a/nmap.h b/nmap.h
index 6cc4d8aa4..1cff37cfc 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.22SOC4"
-#define NMAP_NUM_VERSION "4.22.0.4"
+#define NMAP_VERSION "4.22SOC5"
+#define NMAP_NUM_VERSION "4.22.0.5"
 #endif
 
 /* User configurable #defines: */