diff --git a/CHANGELOG b/CHANGELOG
index f1302116e..2665c2798 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,8 +15,9 @@ o Fixed (I hope) the "getinterfaces: intf_loop() failed" error which
   MAX_IF_TYPE rather than 32).  Thanks to Dan Griffin
   (dan(a)jwsecure.com) for tracking this down!
 
-o Applied a couple minor bug fixes from Marek Majkowski to IP options
-  support (which he previously added) and packet tracing.
+o Applied a couple minor bug fixes for IP options
+  support and packet tracing.  Thanks to Michal Luczaj
+  (regenrecht(a)o2.pl) for reporting them.
 
 o Incorporated SLNP (Simple Library Network Protocol) version
   detection support.  Thanks to Tibor Csogor (tibi(a)tiborius.net) for
diff --git a/docs/nmap.1 b/docs/nmap.1
index e5de61740..85d996f3c 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "NMAP" "1" "11/20/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "12/02/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -91,7 +91,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 \fI\%http://insecure.org/nmap/data/nmap.usage.txt\fR. It helps people remember the most common options, but is no substitute for the in\-depth documentation in the rest of this manual. Some obscure options aren't even included here.
 .PP
 .nf
-Nmap 4.20ALPHA11 ( http://insecure.org )
+Nmap 4.20RC1 ( 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 548a0c6ae..d22eb89af 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.20RC1 ( http://insecure.org )
+Nmap 4.20RC2 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/nmap-os-db b/nmap-os-db
index 9495ce05e..de24d8d60 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -3335,7 +3335,8 @@ U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N|O|Y%T=40%TG=40%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Linux 2.1.24-TiVo-2.5 (ppc)
-Fingerprint Sony SVR-2000 Series 2 TiVo (runs Linux 2.1.24-TiVo-2.5 ppc)
+# Sony SVR-2000 Series 1 TiVo (runs Linux 2.1.24-TiVo-2.5 ppc)
+Fingerprint Sony SVR-2000 TiVo (runs Linux 2.1.24-TiVo-2.5 ppc)
 Class Sony | Linux | 2.1.X | media device
 SEQ(SP=AF-FF%GCD=<7%ISR=107-111%TI=I|RD%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)