diff --git a/docs/nmap.1 b/docs/nmap.1
index ee65c0ff6..336f615c2 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,12 +2,12 @@
.\" Title: nmap
.\" Author: [see the "Author" section]
.\" Generator: DocBook XSL Stylesheets v1.74.3
-.\" Date: 12/24/2009
+.\" Date: 01/14/2010
.\" Manual: Nmap Reference Guide
.\" Source: Nmap
.\" Language: English
.\"
-.TH "NMAP" "1" "12/24/2009" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "01/14/2010" "Nmap" "Nmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -111,7 +111,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
.RS 4
.\}
.nf
-Nmap 5\&.10BETA2 ( http://nmap\&.org )
+Nmap 5\&.20 ( http://nmap\&.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 f39b27dca..a00c18e81 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 5.10BETA2 ( http://nmap.org )
+Nmap 5.20 ( http://nmap.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc.
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index 711807f4f..d2a1264d4 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -2,12 +2,12 @@
.\" Title: zenmap
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.74.3
-.\" Date: 12/24/2009
+.\" Date: 01/14/2010
.\" Manual: Zenmap Reference Guide
.\" Source: Zenmap
.\" Language: English
.\"
-.TH "ZENMAP" "1" "12/24/2009" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "01/14/2010" "Zenmap" "Zenmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index f89d85426..c2fcca49c 100644
--- a/ndiff/docs/ndiff.1
+++ b/ndiff/docs/ndiff.1
@@ -2,12 +2,12 @@
.\" Title: ndiff
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.74.3
-.\" Date: 12/24/2009
+.\" Date: 01/14/2010
.\" Manual: User Commands
.\" Source: Ndiff
.\" Language: English
.\"
-.TH "NDIFF" "1" "12/24/2009" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "01/14/2010" "Ndiff" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
diff --git a/nmap-os-db b/nmap-os-db
index fc7b15c52..6176fa0de 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -34095,28 +34095,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
IE(DFI=N%T=FA-104%TG=FF%CD=S)
-# NetopiaAnalog ADSL Router 3346N
-# Netopia 3397GPB VDSL Router OS Version 7.7.1r3
-# Netopia 3347NWG, Software Release 7.6.1r6
-# Netopia 3347NWG Software Version 7.4.2r2
-# Netopia 3347W wireless ADSL router; SOC OS 7.3.3 (build r0)
-Fingerprint Netopia 3300-series ADSL router
-Class Netopia | SOC OS | 7.X | broadband router
-Class Netopia | SOC OS | 7.X | WAP
-SEQ(SP=F7-109%GCD=1-6%ISR=FF-10F%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=800%W2=800%W3=800%W4=800%W5=800%W6=800)
-ECN(R=Y%DF=N%T=FA-104%TG=FF%W=800%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=O|S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=800%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
-T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
# Netopia 3366N
Fingerprint Netopia 3366-ENT ADSL router
Class Netopia | embedded || broadband router
@@ -34152,6 +34130,28 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
IE(DFI=N%T=FA-104%TG=FF%CD=S)
+# NetopiaAnalog ADSL Router 3346N
+# Netopia 3397GPB VDSL Router OS Version 7.7.1r3
+# Netopia 3347NWG, Software Release 7.6.1r6
+# Netopia 3347NWG Software Version 7.4.2r2
+# Netopia 3347W wireless ADSL router; SOC OS 7.3.3 (build r0)
+Fingerprint Netopia 3300-series ADSL router
+Class Netopia | SOC OS | 7.X | broadband router
+Class Netopia | SOC OS | 7.X | WAP
+SEQ(SP=F7-109%GCD=1-6%ISR=FF-10F%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=800%W2=800%W3=800%W4=800%W5=800%W6=800)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=800%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=O|S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=800%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
# NetOptics iBypass Switch
Fingerprint NetOptics iBypass switch
Class NetOptics | embedded || switch
diff --git a/nmap.h b/nmap.h
index 7ca6fb936..f04338d57 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 "5.10BETA2"
-#define NMAP_NUM_VERSION "5.10.0.2"
+#define NMAP_VERSION "5.20"
+#define NMAP_NUM_VERSION "5.20.0.0"
#endif
/* User configurable #defines: */