diff --git a/nmap-os-db b/nmap-os-db
index 70a05eb5d..986acda75 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -3355,6 +3355,26 @@ T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
+# Cisco IP Phone 7941/7961 Phone,       uname -a reports:      CNU-OS  8.2(1.19) 3.3(0.2) CP-7941G BCM1100-C1(MIPS32)
+# Cisco IP Phone 7941 Series
+# Cisco IP Phone CP-7911G
+# Cisco IP Phone CP-7970G, Version SCCP70.8-2-2SR2S
+Fingerprint Cisco IP Phone (7911, 7941, 7961, or 7970)
+Class Cisco | embedded || VoIP phone
+SEQ(SP=FF-10B%GCD=<7%ISR=101-111%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=N)
+T1(R=Y%DF=N%T=20%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=20%TG=20%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=20%TG=20%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=20%TG=20%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=20%TG=20%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+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%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
+
 # Cisco IP Phone 7910
 Fingerprint Cisco IP Phone 7910
 Class Cisco | embedded || VoIP phone
@@ -3406,21 +3426,22 @@ T7(R=Y%DF=N%T=30|32|33|39|3A%TG=30|32|33|39|3A%W=FFFF%S=A%A=S+%F=AR%O=WFNM109T10
 U1(DF=N%T=FB%TG=FB%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=FB%TG=FB%TOSI=Z%CD=S%SI=S%DLI=S)
 
-Fingerprint Cisco Unified IP Phone 7960
+# Cisco 7941 phone running SIP firmware 8.3(3)SR2
+Fingerprint Cisco IP Phone 7941
 Class Cisco | embedded || VoIP phone
-SEQ(SP=102-10C%GCD=<7%ISR=104-10E%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=FF-109%GCD=<7%ISR=106-110%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
-WIN(W1=578%W2=578%W3=578%W4=578%W5=578%W6=578)
-ECN(R=Y%DF=N%T=40%TG=40%W=578%O=M578%CC=N%Q=)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=N)
 T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)
-T3(R=Y%DF=N%T=40%TG=40%W=578%S=O%A=S+%F=AS%O=M578%RD=0%Q=)
-T4(R=Y%DF=N%T=40%TG=40%W=578%S=Z%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=40%TG=40%W=578%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=578%S=A%A=S%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=578%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-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%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
+T3(R=N)
+T4(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=40%TG=40%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=40%TG=40%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=40%TG=40%TOS=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=40%TG=40%TOSI=20%CD=S%SI=S%DLI=S)
 
 # Cisco CP-7961G-GE, SCCP41.8-3-3SR2S
 Fingerprint Cisco IP Phone 7961
@@ -3439,42 +3460,21 @@ T7(R=Y%DF=N%T=40%TG=40%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 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%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 
-# Cisco IP Phone 7941/7961 Phone,       uname -a reports:      CNU-OS  8.2(1.19) 3.3(0.2) CP-7941G BCM1100-C1(MIPS32)
-# Cisco IP Phone 7941 Series
-# Cisco IP Phone CP-7911G
-# Cisco IP Phone CP-7970G, Version SCCP70.8-2-2SR2S
-Fingerprint Cisco IP Phone (7911, 7941, 7961, or 7970)
+Fingerprint Cisco Unified IP Phone 7960
 Class Cisco | embedded || VoIP phone
-SEQ(SP=FF-10B%GCD=<7%ISR=101-111%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=102-10C%GCD=<7%ISR=104-10E%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=N)
-T1(R=Y%DF=N%T=20%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=20%TG=20%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=20%TG=20%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=20%TG=20%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=20%TG=20%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-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%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
-
-# Cisco 7941 phone running SIP firmware 8.3(3)SR2
-Fingerprint Cisco IP Phone 7941
-Class Cisco | embedded || VoIP phone
-SEQ(SP=FF-109%GCD=<7%ISR=106-110%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=N)
+WIN(W1=578%W2=578%W3=578%W4=578%W5=578%W6=578)
+ECN(R=Y%DF=N%T=40%TG=40%W=578%O=M578%CC=N%Q=)
 T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=40%TG=40%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=40%TG=40%TOS=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=40%TG=40%TOSI=20%CD=S%SI=S%DLI=S)
+T3(R=Y%DF=N%T=40%TG=40%W=578%S=O%A=S+%F=AS%O=M578%RD=0%Q=)
+T4(R=Y%DF=N%T=40%TG=40%W=578%S=Z%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=40%TG=40%W=578%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=40%TG=40%W=578%S=A%A=S%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=40%TG=40%W=578%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+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%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # Cisco Wireless IP Phone 7920-ETSI
 Fingerprint Cisco Wireless IP Phone 7920-ETSI
@@ -7094,6 +7094,23 @@ T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
 IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
+# HP 9100c Digital Sender  (scanner)
+Fingerprint HP 9100c Digital Sender multifunction printer
+Class HP | embedded || printer
+SEQ(R=N)
+OPS(R=N)
+WIN(R=N)
+ECN(R=N)
+T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
+IE(DFI=S%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
+
 # HP 9100C Digital Sender (J3113A)
 Fingerprint HP 9100c Digital Sender multifunction printer (J3113A)
 Class HP | embedded || printer
@@ -7709,23 +7726,6 @@ T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
 IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# HP 9100c Digital Sender  (scanner)
-Fingerprint HP 9100c Digital Sender multifunction printer
-Class HP | embedded || printer
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
-
 # HP J4093A ProCurve Switch 2424M Firmware revision C.09.28
 Fingerprint HP 2424M ProCurve switch (J4093A)
 Class HP | embedded || switch
@@ -13502,6 +13502,23 @@ T7(R=N)
 U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(R=N)
 
+# Linux 2.6.22-14-rt #1 SMP PREEMPT RT Tue Feb 12 09:57:10 UTC 2008 i686 GNU/Linux
+Fingerprint Linux 2.6.22
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=CB-F5%GCD=<7%ISR=EA-F4%TI=Z%II=I%TS=A)
+OPS(O1=M557ST11NW6%O2=M557ST11NW6%O3=M557NNT11NW6%O4=M557ST11NW6%O5=M557ST11NW6%O6=M557ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=40%TG=40%W=16D0%O=M557NNSNW6%CC=N%Q=)
+T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
 # Linux 2.6.22-2-amd64 #1 SMP Thu Aug 30 23:43:59 UTC 2007 x86_64, Debian lenny/sid (AMD64)
 Fingerprint Linux 2.6.22 (Debian, x86_64)
 Class Linux | Linux | 2.6.X | general purpose
@@ -14533,6 +14550,23 @@ T7(R=N)
 U1(DF=N%T=40%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 | specialized
+SEQ(SP=C4-CE%GCD=<7%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=40%TG=40%W=16D0%O=M5B4NNSNW3%CC=N%Q=)
+T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=40%TG=40%W=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW3%RD=0%Q=)
+T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=40%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 | specialized
@@ -23308,37 +23342,3 @@ T6(R=Y%DF=N%T=FE%TG=FE%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
 T7(R=Y%DF=N%T=FE%TG=FE%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FE%TG=FE%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=D624%RUL=G%RUD=G)
 IE(DFI=N%T=FE%TG=FE%TOSI=S%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 | specialized
-SEQ(SP=C4-CE%GCD=<7%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=40%TG=40%W=16D0%O=M5B4NNSNW3%CC=N%Q=)
-T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=40%TG=40%W=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW3%RD=0%Q=)
-T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
-# Linux 2.6.22-14-rt #1 SMP PREEMPT RT Tue Feb 12 09:57:10 UTC 2008 i686 GNU/Linux
-Fingerprint Linux 2.6.22
-Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=CB-F5%GCD=<7%ISR=EA-F4%TI=Z%II=I%TS=A)
-OPS(O1=M557ST11NW6%O2=M557ST11NW6%O3=M557NNT11NW6%O4=M557ST11NW6%O5=M557ST11NW6%O6=M557ST11)
-WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
-ECN(R=Y%DF=Y%T=40%TG=40%W=16D0%O=M557NNSNW6%CC=N%Q=)
-T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)