diff --git a/CHANGELOG b/CHANGELOG
index f70cdca23..f1302116e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 # Nmap Changelog ($Id$); -*-text-*-
-4.20
+
+4.20RC2
+
+o Integrated all of your OS detection submissions since RC1.  The DB
+  has increased 13% to 214 fingerprints.  Please keep them coming!
+  New fingerprints include versions of z/OS, OpenBSD, Linux, AIX,
+  FreeBSD, Cisco CatOS, IPSO firewall, and a slew of printers and
+  misc. devices.  We also got our first Windows 95 fingerprint,
+  submitted anonymously of course :).
 
 o Fixed (I hope) the "getinterfaces: intf_loop() failed" error which
   was seen on Windows Vista.  The problem was apparently in
diff --git a/Makefile.in b/Makefile.in
index 22202742e..e7f681d0c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.20RC1
+export NMAP_VERSION = 4.20RC2
 NMAP_NAME= Nmap
 NMAP_URL= http://insecure.org
 NMAP_PLATFORM=@host@
diff --git a/nmap-os-db b/nmap-os-db
index 98d0b389b..9495ce05e 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -2675,7 +2675,7 @@ IE(DFI=S%T=80%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Windows 95 4.00.950B on VMWare Server 1.0.1
 Fingerprint Windows 95 4.00.950B
-Class Microsoft | Windows | 95/98/ME | general purpose
+Class Microsoft | Windows | 95 | general purpose
 SEQ(SP=0-50%GCD=<7|6E|DC|14A|1B8|226|294%ISR=4B-55%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index 572945936..08fd44633 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -106,7 +106,7 @@
 /* Without this, Windows will give us all sorts of crap about using functions
    like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
-#define NMAP_VERSION "4.20RC1"
+#define NMAP_VERSION "4.20RC2"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://insecure.org"
 #define NMAP_PLATFORM "i686-pc-windows-windows"