diff --git a/nmap-os-db b/nmap-os-db
index 66135bc7e..54f168d36 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -501,11 +501,13 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # Baseline Switch 2924-SFP Plus
 # Cisco ESW 520 "Small Business Pro" managed switch. OS Version: 2.0.3
-Fingerprint 3Com Baseline Switch 2924-SFP or Cisco ESW-520 switch
+# Allied Telesis Series 8000
+Fingerprint 3Com Baseline Switch 2924-SFP or Cisco ESW-520 switch or Allied Telesis AT-8000 series switch
 Class 3Com | embedded || switch
 CPE cpe:/h:3com:baseline_switch_2924-sfp
 Class Cisco | embedded || switch
 CPE cpe:/h:cisco:esw-520
+Class Allied Telesis | embedded || switch
 SEQ(SP=FD-10D%GCD=1-6%ISR=FA-112%TI=RD%CI=RD|RI%II=RI%TS=U)
 OPS(O1=%O2=%O3=%O4=%O5=%O6=)
 WIN(W1=100%W2=100%W3=100%W4=100%W5=100%W6=100)
@@ -16253,6 +16255,30 @@ T7(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=S%F=AR%RD=0)
 U1(DF=N%T=F7-101%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=F7-101%TG=FF%CD=S)
 
+# Cisco AIR-AP1141N-E-K9 running IOS 12.4(21a)JA1
+# AIR-CAP3602I-E-K9, Cisco IOS Software, C3600 Software (AP3G2-K9W7-M), Version 15.3(3)JAB, RELEASE SOFTWARE (fc1)
+Fingerprint Cisco Aironet 1141N (IOS 12.4) or 3602I (IOS 15.3) WAP
+Class Cisco | IOS | 12.X | WAP
+CPE cpe:/o:cisco:ios:12 auto
+Class Cisco | IOS | 15.X | WAP
+CPE cpe:/h:cisco:aironet_1141n
+CPE cpe:/h:cisco:aironet_3602i
+CPE cpe:/o:cisco:ios:12.4
+CPE cpe:/o:cisco:ios:15.3
+SEQ(SP=F8-10A%GCD=1-6%ISR=106-110%TI=RD%CI=RD%II=RI%TS=U)
+OPS(O1=M5B4%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
+WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+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=A%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=A%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=S%T=FA-104%TG=FF%CD=S)
+
 # Cisco Aironet 1200 Series (AIR-LAP-1232AG-E-K9)
 Fingerprint Cisco Aironet 1200 WAP (IOS 12.3)
 Class Cisco | IOS | 12.X | WAP
@@ -16389,25 +16415,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%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=S%T=FA-104%TG=FF%CD=S)
 
-# Cisco AIR-AP1141N-E-K9 running IOS 12.4(21a)JA1
-Fingerprint Cisco Aironet AIR-AP1141N WAP (IOS 12.4)
-Class Cisco | IOS | 12.X | WAP
-CPE cpe:/h:cisco:aironet_ap1241n
-CPE cpe:/o:cisco:ios:12.4
-SEQ(SP=F8-10A%GCD=1-6%ISR=106-110%TI=RD%CI=RD%II=RI%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-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=A%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=A%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=S%T=FA-104%TG=FF%CD=S)
-
 # cisco AIR-AP1232AG-E-K9 Cisco IOS Software, C1200 Software (C1200-K9W7-M), Version 12.3(7)JA2, RELEASE SOFTWARE (fc1)
 # Cisco IOS Software, C1240 Software (C1240-K9W7-M), Version 12.3(8)JA2, RELEASE SOFTWARE (fc1)
 # Cisco 5350 Media Gateway
@@ -16691,10 +16698,13 @@ T7(R=Y%DF=Y%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# Linux AP541N-E-K9 2.6.21.5 #1 Thu Sep 10 13:14:03 EDT 2009 mips64 unknown, Cisco AP541N access point
-Fingerprint Cisco AP541N WAP (Linux 2.6.21, MIPS)
+# Linux AP541N-E-K9 2.6.21.5 #1 Thu Sep 10 13:14:03 EDT 2009 mips64 unknown, Cisco AP541N access point (Not sure of this one, TCP Options look wrong, --ed.)
+# Ethernet Routing Switch 5510-48T, HW:33, FW:6.0.0.16, SW:v6.3.1.039 BN:39 (c) Avaya Networks
+Fingerprint Cisco AP541N WAP (Linux 2.6.21) or Avaya ERS 5510 switch
 Class Cisco | Linux | 2.6.X | WAP
 CPE cpe:/o:cisco:linux_kernel:2.6 auto
+Class Avaya | embedded || switch
+CPE cpe:/h:avaya:ers_5510 auto
 SEQ(SP=FD-107%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
@@ -21661,6 +21671,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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
+# HP 1810-24G, PL.1.2, eCos-3.0, 1_12_8-customized-h
+# ZyXEL GS1910-24
+# FibroLAN switch (eCos)
+Fingerprint HP ProCurve 1810G, ZyXEL GS1910, or FibroLAN switch (eCos 3.0)
+Class eCos | eCos | 3.X | switch
+CPE cpe:/h:hp:procurve_1810g
+CPE cpe:/h:zyxel:gs1910
+CPE cpe:/o:ecos:ecos:3 auto
+SEQ(SP=F9-10A%GCD=1-6%ISR=100-110%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # Efficient 5930 DMT Router (5930-001) v6.1.020
 Fingerprint Efficient Networks 5930 ADSL router
 Class Efficient Networks | embedded || broadband router
@@ -28370,24 +28402,6 @@ T7(R=Y%DF=N%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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# HP 1810-24G, PL.1.2, eCos-3.0, 1_12_8-customized-h
-Fingerprint HP ProCurve 1810G switch (eCos 3.0)
-Class HP | eCos | 3.X | switch
-CPE cpe:/o:hp:ecos:3 auto
-SEQ(SP=F9-103%GCD=1-6%ISR=100-110%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # HP 1810-24G, PL.1.9, eCos-3.0, 1_12_8-customized-h
 Fingerprint HP ProCurve 1810G switch (eCos 3.0)
 Class HP | eCos | 3.X | switch
@@ -37058,8 +37072,12 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Koukaam Device: NETIO-230A Firmware: V 2.31
-Fingerprint Koukaam NETIO-230A power control device
+# Zyxel SP-220E Thermal Printer
+Fingerprint Koukaam NETIO-230A power control device or ZyXEL SP-220E thermal printer
 Class Koukaam | embedded || power-device
+CPE cpe:/h:koukaam:netio-230a
+Class ZyXEL | embedded || printer
+CPE cpe:/h:zyxel:sp-220e
 SEQ(SP=0-2B%GCD=A|14|1E|28|32|29E|53C|7DA|A78|D16%ISR=60-6A%TI=I%CI=I%II=RI%SS=O|S%TS=U)
 OPS(O1=M5BA%O2=M5BA%O3=M5BA%O4=M5BA%O5=M5BA%O6=M5BA)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -61364,7 +61382,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows 7 SP1 or Windows Server 2008 R2 SP1
 Class Microsoft | Windows | 2008 | general purpose
 CPE cpe:/o:microsoft:windows_server_2008:r2:sp1
-SEQ(SP=101-10B%GCD=1-6%ISR=104-113%TI=I%CI=I|RD%II=I%SS=S%TS=7)
+SEQ(SP=FD-10B%GCD=1-6%ISR=104-113%TI=I%CI=I|RD%II=I%SS=S%TS=7)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
@@ -61948,24 +61966,6 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# 6.0.6002 Service Pack 2 Build 6002
-Fingerprint Microsoft Windows Server 2008 SP2
-Class Microsoft | Windows | 2008 | general purpose
-CPE cpe:/o:microsoft:windows_server_2008::sp2
-SEQ(SP=D2-11B%GCD=1-6%ISR=F5-113%TI=I%CI=I%II=I%SS=O%TS=7)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O|S+%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Windows Server 2008 Standard Version 6.0 (Build 6002: Service Pack 2)
 Fingerprint Microsoft Windows Server 2008 SP2
 Class Microsoft | Windows | 2008 | general purpose
@@ -62002,6 +62002,26 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# 6.0.6002 Service Pack 2 Build 6002
+Fingerprint Microsoft Windows Server 2008 SP2 or Windows 10 Tech Preview
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008::sp2
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows auto
+SEQ(SP=D2-11B%GCD=1-6%ISR=F5-113%TI=I%CI=I%II=I%SS=O%TS=7)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O|S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Version 6.1 (Build 7601: Service Pack 1)
 Fingerprint Version 6.1 (Build 7601: Service Pack 1)
 Class Microsoft | Windows | 2008 | general purpose
@@ -62787,25 +62807,6 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# Windows 7 Enterprise (Version 6.1.7600) English
-# windows 7 professional ver 6.1 (build 7600)
-Fingerprint Microsoft Windows 7 Enterprise
-Class Microsoft | Windows | 7 | general purpose
-CPE cpe:/o:microsoft:windows_7:::enterprise
-SEQ(SP=F3-109%GCD=1-6%ISR=F9-10D%TI=I%CI=RI%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
-ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=7FFF%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%S=O%A=S+%F=A|AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=7FFF%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(R=N)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Microsoft Windows 7 Enterprise [Version 6.1.7601]
 Fingerprint Microsoft Windows 7 Enterprise
 Class Microsoft | Windows | 7 | general purpose
@@ -62884,6 +62885,28 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Windows 7 Enterprise (Version 6.1.7600) English
+# windows 7 professional ver 6.1 (build 7600)
+# Windows Server 2012 Datacenter
+Fingerprint Microsoft Windows 7 or Windows Server 2012
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012 auto
+SEQ(SP=F3-109%GCD=1-6%ISR=F9-10D%TI=I%CI=RI%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=7FFF%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%S=O%A=S+%F=A|AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=7FFF%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(R=N)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Windows 7 Professional version 6.1 build 7600  64Bit IA64
 Fingerprint Microsoft Windows 7 Professional
 Class Microsoft | Windows | 7 | general purpose
@@ -70763,6 +70786,24 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
+# No closed ports or ICMP responses
+Fingerprint Microsoft Xbox 360 Dashboard
+Class Microsoft | Xbox 360 || media device
+CPE cpe:/h:microsoft:xbox_360_kernel
+SEQ(SP=55-5F%GCD=1-6%ISR=C8-D2%TI=I%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
+WIN(W1=4470%W2=4470%W3=4470%W4=4470%W5=4470%W6=4470)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=4470%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=4470%S=O%A=S+%F=AS%O=M5B4NW0%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=N)
+T6(R=N)
+T7(R=N)
+U1(R=N)
+IE(R=N)
+
 # OS-9/68K V3.0.3 ELTEC BAB-40 - 68040
 Fingerprint Microware OS-9/68000 3.0.3
 Class Microware | OS-9 || specialized
@@ -71516,25 +71557,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Motorola SBV6120 Broadband DOCSIS 3.0 Modem
-# Motorola SURFboard Model SB6120 Firmware Name: SB_KOMODO-1.0.6.6-SCM00-NOSH
-Fingerprint Motorola SURFboard SBV6120 cable modem
-Class Motorola | embedded || broadband router
-CPE cpe:/h:motorola:surfboard_sbv6120 auto
-SEQ(SP=C5-CF%GCD=1-6%ISR=C6-D4%TI=Z%II=I%TS=7)
-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=N)
-T4(R=N)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Motorola QIP2500 IPTV set-top box for Verizon FIOS
 Fingerprint Motorola QIP2500 set top box
 Class Motorola | embedded || media device
@@ -71849,6 +71871,28 @@ T7(R=Y%DF=N%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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Motorola SBV6120 Broadband DOCSIS 3.0 Modem
+# Motorola SURFboard Model SB6120 Firmware Name: SB_KOMODO-1.0.6.6-SCM00-NOSH
+# Motorola Surfboard SB6141. SB_KOMODO-1.0.6.12-SCM00-NOSH
+# http://sourceforge.net/projects/sb6141.arris/files/SB6141_1_0_6_1_SCM00/
+Fingerprint Motorola SURFboard SB6120 or SB6141 cable modem
+Class Motorola | Linux | 2.6.X | broadband router
+CPE cpe:/h:motorola:surfboard_sb6120
+CPE cpe:/h:motorola:surfboard_sb6141
+SEQ(SP=C5-CF%GCD=1-6%ISR=C6-D4%TI=Z%II=I%TS=7)
+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=N)
+T4(R=N)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Motorola UNIX(r) System V/88 Release 4.0
 Fingerprint Motorola System V/88 Unix R4.0
 Class Motorola | V/88 | 4.X | general purpose
@@ -89957,24 +90001,6 @@ T7(R=Y%DF=N%T=FE%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FE%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FE%TG=FF%CD=S)
 
-# ZyXEL GS1910-24
-Fingerprint ZyXEL GS1910 switch
-Class ZyXEL | embedded || switch
-CPE cpe:/h:zyxel:gs1910 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # Linux version 2.6.17.14_stm22_0041-STB1001H (hhchang@ipav5) (gcc version 4.1.1 (STMicroelectronics/Linux Base 4.1.1-23)) #1 PREEMPT Wed jul 21 14:19:46 CST 2010, Zyxel STB-1001H device provided by http://www.sgtsa.pl/jambox for IPTV 
 Fingerprint ZyXEL STB-1001H set-top box (Linux 2.6.17)
 Class ZyXEL | Linux | 2.6.X | media device
diff --git a/nmap-service-probes b/nmap-service-probes
index 268302be5..5a951e27f 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -8345,6 +8345,7 @@ match http m|^HTTP/1\.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: 17\
 # http://hg.barrelfish.org/file/tip/usr/webserver/
 match http m|^HTTP/1\.0 200 OK\r\nServer: Barrelfish\r\n| p/Barrelfish httpd/ o/Barrelfish/ cpe:/o:barrelfish:barrelfish/
 match http m|^HTTP/1\.1 401 Unauthorized\r\nContent-Type: text/html\r\nConnection: close\r\nPragma: no-cache\r\nWWW-Authenticate: Basic realm=\"netcam\"\r\nContent-Length: 17\r\n\r\n401 Unauthorized\n$| p/TRENDnet TV-IP100 or TV-IP110 webcam display httpd/ d/webcam/ cpe:/h:trendnet:tv-ip100/ cpe:/h:trendnet:tv-ip110/
+# False positives reported for EMC VNX 5200 - SAN device:
 match http m|^HTTP/1\.1 403 Forbidden\r\nContent-Length: 0\r\n\r\n$| p/TRENDnet TV-IP110W webcam display httpd/ d/webcam/ cpe:/h:trendnet:tv-ip110w/
 # Trendnet TV-IP110w
 match http m|^HTTP/1\.1 401 Unauthorized\r\nContent-Type: text/html\r\nConnection: close\r\nWWW-Authenticate: Basic realm=\"netcam\"\r\nContent-Length: 17\r\n\r\n401 Unauthorized\n$| p/TRENDnet TV-IP110w or TV-IP422W webcam display httpd/ d/webcam/ cpe:/h:trendnet:tv-ip110w/ cpe:/h:trendnet:tv-ip422w/