diff --git a/nmap-os-db b/nmap-os-db
index b4d8cee3a..ee19f57cd 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -16064,6 +16064,23 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=3B-45%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 
+# 2.6.18-6-686 #1 SMP i686 GNU\Linux (VMware, Debian 4, network supervising)
+Fingerprint Linux 2.6.18 (Debian 4, VMware)
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=C4-CE%GCD=1-6%ISR=C6-D0%TI=Z%II=I%TS=4|5)
+OPS(O1=M5B4ST11NW3%O2=M5B4ST11NW3%O3=M5B4NNT11NW3%O4=M5B4ST11NW3%O5=M5B4ST11NW3%O6=M5B4ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW3%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW3%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
 # Linux 2.6.18-4-686 #1 SMP Mon Mar 26 17:17:36 UTC 2007 i686 GNU/Linux, Debian 4.0 rev0 i386
 # Debian GNU/Linux  - Etch 2.6.18-4-686 #1 SMP (dual PIII processors) Wed Apr 18 09:55:10 UTC 2007 i686
 Fingerprint Linux 2.6.18 (Debian 4.0, x86)
@@ -16082,6 +16099,23 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=S|Z%CD=S%SI=S%DLI=S)
 
+# Linux 2.6.18-4-686 Debian 4.0
+Fingerprint Linux 2.6.18 (Debian 4.0, x86)
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=BE-C8%GCD=1-6%ISR=C0-CA%TI=Z%II=I%TS=8)
+OPS(O1=M5ACST11NW2%O2=M5ACST11NW2%O3=M5ACNNT11NW2%O4=M5ACST11NW2%O5=M5ACST11NW2%O6=M5ACST11)
+WIN(W1=1680%W2=1680%W3=1680%W4=1680%W5=1680%W6=1680)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16B0%O=M5ACNNSNW2%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
 # uname -a  ::  Linux 2.6.18-4-486 #1 Mon Mar 26 16:39:10 UTC 2007 i586 GNU/Linux
 Fingerprint Linux 2.6.18 (Debian, x86)
 Class Linux | Linux | 2.6.X | general purpose
@@ -19410,6 +19444,23 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
+# Linux 2.6.9-42.ELsmp #1 SMP Wed Jul 12 23:32:02 EDT 2006 x86_64 x86_64 x86_64 GNU/Linux Redhat Enterprise Linux AS release 4 AMD64
+Fingerprint Linux 2.6.9-42.ELsmp (Red Hat Enterprise Linux AS release 4, x86_64)
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=BE-C8%GCD=1-6%ISR=C3-CD%TI=Z%II=I%TS=A)
+OPS(O1=M400CST11NW4%O2=M400CST11NW4%O3=M400CNNT11NW4%O4=M400CST11NW4%O5=M400CST11NW4%O6=M400CST11)
+WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%O=M400CNNSNW4%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%S=O%A=S+%F=AS%O=M400CST11NW4%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
 # Linux 2.6.9-55.0.2.EL #1 Tue Jun 12 17:47:10 EDT 2007 i686 athlon i386 GNU/Linux - Red Hat Enterprise Linux ES release 4 (Nahant Update 5)
 Fingerprint Linux 2.6.9-55.0.2.EL (Red Hat Enterprise Linux)
 Class Linux | Linux | 2.6.X | general purpose
@@ -19478,57 +19529,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(R=N)
 
-# 2.6.18-6-686 #1 SMP i686 GNU\Linux (VMware, Debian 4, network supervising)
-Fingerprint Linux 2.6.18 (Debian 4, VMware)
-Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=C4-CE%GCD=1-6%ISR=C6-D0%TI=Z%II=I%TS=4|5)
-OPS(O1=M5B4ST11NW3%O2=M5B4ST11NW3%O3=M5B4NNT11NW3%O4=M5B4ST11NW3%O5=M5B4ST11NW3%O6=M5B4ST11)
-WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW3%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW3%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
-# Linux 2.6.18-4-686 Debian 4.0
-Fingerprint Linux 2.6.18 (Debian 4.0, x86)
-Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=BE-C8%GCD=1-6%ISR=C0-CA%TI=Z%II=I%TS=8)
-OPS(O1=M5ACST11NW2%O2=M5ACST11NW2%O3=M5ACNNT11NW2%O4=M5ACST11NW2%O5=M5ACST11NW2%O6=M5ACST11)
-WIN(W1=1680%W2=1680%W3=1680%W4=1680%W5=1680%W6=1680)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16B0%O=M5ACNNSNW2%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
-# Linux 2.6.9-42.ELsmp #1 SMP Wed Jul 12 23:32:02 EDT 2006 x86_64 x86_64 x86_64 GNU/Linux Redhat Enterprise Linux AS release 4 AMD64
-Fingerprint Linux 2.6.9-42.ELsmp (Red Hat Enterprise Linux AS release 4, x86_64)
-Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=BE-C8%GCD=1-6%ISR=C3-CD%TI=Z%II=I%TS=A)
-OPS(O1=M400CST11NW4%O2=M400CST11NW4%O3=M400CNNT11NW4%O4=M400CST11NW4%O5=M400CST11NW4%O6=M400CST11)
-WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%O=M400CNNSNW4%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%S=O%A=S+%F=AS%O=M400CST11NW4%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Linux 2.6.16 #1 PREEMPT Thu Jun 8 23:38:13 PDT 2006 armv5tel GNU/Linux Linksys NSLU2 with SlugOS (SlugOS/LE) bootstraped with Debian Sarge
 Fingerprint Linksys NSLU2 NAS device running SlugOS/LE (Linux 2.6.16)
 Class Linux | Linux | 2.6.X | storage-misc