diff --git a/nmap-os-db b/nmap-os-db
index d65222a1b..4795233c3 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -4735,26 +4735,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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# OS X 10.10
-# 14.0.0 Darwin Kernel Version 14.0.0: Fri Sep 19 00:26:44 PDT 2014; root:xnu-2782.1.97~2/RELEASE_X86_64 x86_64
-# Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10 (Yosemite) (Darwin 14.0.0 - 14.3.0)
-Class Apple | Mac OS X | 10.10.X | general purpose
-CPE cpe:/o:apple:mac_os_x:10.10 auto
-SEQ(SP=FD-10B%GCD=1-6%ISR=FB-111%TI=RD%CI=RI%II=RI%TS=A)
-OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%O6=M5B4NNT11SLL)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW5SLL%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=N)
-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=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)
-
 # Darwin 14.0.0 Darwin Kernel Version 14.0.0: Fri Sep 19 00:26:44 PDT 2014; root:xnu-2782.1.97~2/RELEASE_X86_64 x86_64
 Fingerprint Apple Mac OS X 10.10 (Yosemite) (Darwin 14.0.0)
 Class Apple | Mac OS X | 10.10.X | general purpose
@@ -4773,6 +4753,29 @@ 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=S%T=3B-45%TG=40%CD=S)
 
+# OS X 10.10
+# 14.0.0 Darwin Kernel Version 14.0.0: Fri Sep 19 00:26:44 PDT 2014; root:xnu-2782.1.97~2/RELEASE_X86_64 x86_64
+# Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
+# OS X El Capitan 10.11.0
+Fingerprint Apple Mac OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.0.0)
+Class Apple | Mac OS X | 10.10.X | general purpose
+CPE cpe:/o:apple:mac_os_x:10.10 auto
+Class Apple | Mac OS X | 10.11.X | general purpose
+CPE cpe:/o:apple:mac_os_x:10.11 auto
+SEQ(SP=FD-10B%GCD=1-6%ISR=FB-111%TI=RD%CI=RI%II=RI%TS=A)
+OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%O6=M5B4NNT11SLL)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW5SLL%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=N)
+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=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)
+
 # Localhost
 # Darwin 14.0.0 Darwin Kernel Version 14.0.0: Wed Jul 16 00:46:31 PDT 2014; root:xnu-2782.1.43.0.2~2/RELEASE_X86_64 x86_64
 # Darwin 14.3.0 Darwin Kernel Version 14.3.0: Mon Mar 23 11:59:05 PDT 2015; root:xnu-2782.20.48~5/RELEASE_X86_64 x86_64
@@ -9171,6 +9174,24 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%RD=0)
 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)
 
+# PacketShaper v9.2.3g1
+Fingerprint Blue Coat PacketShaper appliance
+Class Blue Coat | embedded || proxy server
+CPE cpe:/h:bluecoat:packetshaper
+SEQ(CI=I%II=I%TS=U)
+OPS(R=N)
+WIN(R=N)
+ECN(R=N)
+T1(R=Y%DF=N%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=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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # Blue Coat proxy server running SGOS 3.2.4.8
 Fingerprint Blue Coat proxy server (SGOS 3.2.4.8)
 Class Blue Coat | SGOS | 3.X | proxy server
@@ -9670,6 +9691,24 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=44%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=I)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# Brocade ICX 6610 24 port Campus Networking Switch
+Fingerprint Brocade ICX 6610 switch
+Class Brocade | embedded || switch
+CPE cpe:/h:brocade:icx_6610 auto
+SEQ(SP=7D-87%GCD=1-6%ISR=88-92%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M56A%O2=M56A%O3=M56A%O4=M56A%O5=M56A%O6=M56A)
+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=M56A%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=U)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=U)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=U)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=U)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=U)
+U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Brocade Layer 2 switch OS
 Fingerprint Brocade Layer 2 switch
 Class Brocade | embedded || switch
@@ -9831,6 +9870,24 @@ T7(R=Y%DF=N%T=79%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=79%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=87B7%RUD=G)
 IE(DFI=N%T=79%TG=80%CD=Z)
 
+# Brother DCP-7065DN
+Fingerprint Brother DCP-7065DN printer
+Class Brother | embedded || printer
+CPE cpe:/h:brother:dcp-7065dn auto
+SEQ(SP=C-16%GCD=1E848|3D090|5B8D8|7A120|98968%ISR=9F-A9%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
+ECN(R=Y%DF=N%T=3C-46%TG=40%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=Y%T=3C-46%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=FB-105%TG=FF%CD=S)
+
 # Brother DCP-7070DW, Firmware Version : H, Sub Firmware Version : 1.01
 Fingerprint Brother DCP-7070DW printer
 Class Brother | embedded || printer
@@ -9885,6 +9942,24 @@ 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=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)
 
+# Brother DCP-L2540DN
+Fingerprint Brother DCP-L2540DN printer
+Class Brother | embedded || printer
+CPE cpe:/h:brother:dcp-l2540dn auto
+SEQ(CI=RI)
+OPS(O1=%O2=%O3=%O4=%O5=%O6=)
+WIN(W1=0%W2=0%W3=0%W4=0%W5=0%W6=0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=Z%A=S+%F=AR%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+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=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)
+
 # Brother NC-3100h Firmware Ver.3.20 (00.08.31), Brother NC-3100h Command Console
 Fingerprint Brother HL-1270N printer
 Class Brother | embedded || printer
@@ -10789,8 +10864,12 @@ 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)
 
 # Brother document scanner ADS-2600W
-Fingerprint Brother ADS-2600W scanner
+# HL-3170CDW
+Fingerprint Brother ADS-2600W scanner or HL-3170CDW printer
 Class Brother | embedded || specialized
+CPE cpe:/h:brother:ads-2600w
+Class Brother | embedded || printer
+CPE cpe:/h:brother:hl-3170cdw
 SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=RD|RI%CI=I%II=I%TS=8|A|B)
 OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
 WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
@@ -11380,6 +11459,24 @@ 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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# Canon MF212w
+Fingerprint Canon imageCLASS MF212w printer
+Class Canon | embedded || printer
+CPE cpe:/h:canon:imageclass_mf212w auto
+SEQ(SP=D4-DE%GCD=1-6%ISR=DA-E4%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4W0L%O2=M5B4W0L%O3=M5B4W0L%O4=M5B4W0L%O5=M5B4W0L%O6=M5B4)
+WIN(W1=7918%W2=7918%W3=7918%W4=7918%W5=7918%W6=7918)
+ECN(R=Y%DF=N%T=130-13A%TG=FF%W=7918%O=M5B4W0L%CC=N%Q=)
+T1(R=Y%DF=N%T=130-13A%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=130-13A%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=130-13A%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=130-13A%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=130-13A%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=130-13A%TG=FF%IPL=240%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=849B%RUD=I)
+IE(DFI=N%T=130-13A%TG=FF%CD=Z)
+
 # Canon ImageClass MF4570dw Monochrome Laser Printer
 # Canon MF4500 Series Printer
 # Canon MF4800
@@ -11887,6 +11984,23 @@ 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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# MX870, but same as the one with *all* the Pixma printers. Differs only in MSS
+Fingerprint Canon Pixma printer
+Class Canon | embedded || printer
+SEQ(SP=0-23%GCD=>1000000%ISR=102-10C%TI=RD%CI=RD%II=RI%TS=U)
+OPS(O1=M556%O2=M556%O3=M280%O4=M556%O5=M218%O6=M109)
+WIN(W1=2D00%W2=2D00%W3=2D00%W4=2D00%W5=2D00%W6=2D00)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=2D00%O=M556%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=2D00%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Casio QT600/QT6100 cash registering machine
 Fingerprint Casio QT-6000 or QT-6100 point-of-sale machine
 Class Casio | embedded || specialized
@@ -12701,9 +12815,10 @@ IE(DFI=S%T=7B-85%TG=80%CD=S)
 # AIR-CT2504-5-K9
 # AIR-CT5508-K9
 # Cisco WLC version 7.6
+# AIR-CT2504-K9, 7.6.130.0
 Fingerprint Cisco 2500- or 5500-series Wireless Controller
 Class Cisco | embedded || remote management
-SEQ(SP=C2-CC%GCD=1-6%ISR=C3-D1%TI=Z%CI=I%II=RI%TS=8)
+SEQ(SP=C2-CC%GCD=1-6%ISR=C3-D3%TI=Z%CI=I%II=RI%TS=8)
 OPS(O1=M56EST11NW6%O2=M56EST11NW6%O3=M56ENNT11NW6%O4=M56EST11NW6%O5=M56EST11NW6%O6=M56EST11)
 WIN(W1=1588%W2=1588%W3=1588%W4=1588%W5=1588%W6=1588)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=15B8%O=M56ENNSNW6%CC=N%Q=)
@@ -13016,7 +13131,7 @@ Fingerprint Cisco SF300 or SG300 switch
 Class Cisco | embedded || switch
 CPE cpe:/h:cisco:sf300 auto
 CPE cpe:/h:cisco:sg300 auto
-SEQ(SP=FD-109%GCD=1-6%ISR=104-113%TI=RD|Z%CI=RD|RI|Z%II=RI%TS=U)
+SEQ(SP=F5-109%GCD=1-6%ISR=104-113%TI=RD|Z%CI=RD|RI|Z%II=RI%TS=U)
 OPS(O1=M596%O2=M596%O3=M596%O4=M596%O5=M596%O6=M596)
 WIN(W1=800%W2=800%W3=800%W4=800%W5=800%W6=800)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=800%O=M596%CC=N%Q=)
@@ -13836,6 +13951,24 @@ T7(R=N)
 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)
 
+# Cisco CP-6921
+Fingerprint Cisco Unified IP Phone 6921
+Class Cisco | embedded || VoIP phone
+CPE cpe:/h:cisco:unified_ip_phone_6921
+SEQ(SP=FA-10C%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=9)
+OPS(O1=M5B0NW0NNT11%O2=M5B0NW0NNT11%O3=M5B0NW0NNT11%O4=M5B0NW0NNT11%O5=M5B0NW0NNT11%O6=M5B0NNT11)
+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=M5B0NW0%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=M5B0NW0NNT11%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=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # Cisco IP Phone 7905G, SIP Firmware 8.0.0
 # Cisco IP Phone 7960 series phone
 # Cisco ATA phone adapter
@@ -13857,6 +13990,24 @@ T7(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=F5-FF%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=F5-FF%TG=FF%CD=S)
 
+# CP-7924G
+Fingerprint Cisco Unified IP Phone 7942G
+Class Cisco | embedded || VoIP phone
+CPE cpe:/h:cisco:unified_ip_phone_7924g
+SEQ(SP=FD-107%GCD=4|8|C|10|14%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M4E2%O2=M4E2%O3=M4E2%O4=M4E2%O5=M4E2%O6=M4E2)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=N)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=2000%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 Fingerprint Cisco Unified IP Phone 7960
 Class Cisco | embedded || VoIP phone
 CPE cpe:/h:cisco:unified_ip_phone_7960
@@ -14666,6 +14817,24 @@ T7(R=Y%DF=N%T=FB-105%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FB-105%TG=FF%CD=S)
 
+# Cisco IOS Software, 7200 Software (C7200P-KBOOT-M), Version 12.4(22)T, RELEASE SOFTWARE (fc1)
+Fingerprint Cisco 7200 router (IOS 12.4)
+Class Cisco | IOS | 12.X | router
+CPE cpe:/o:cisco:ios:12.4 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=107-111%TI=RD%II=RI%TS=A)
+OPS(O1=M20CT11LL%O2=M20CT11LL%O3=M20CT11LL%O4=M20CT11LL%O5=M20CT11LL%O6=M109T11LL)
+WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
+ECN(R=Y%DF=N%T=FB-105%TG=FF%W=1020%O=M218%CC=N%Q=)
+T1(R=Y%DF=N%T=FB-105%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=FB-105%TG=FF%CD=S)
+
 # Cisco 7206VXR (NPE-G2) router running 12.4(11)T
 Fingerprint Cisco 7206VXR router (IOS 12.4)
 Class Cisco | IOS | 12.X | router
@@ -16639,6 +16808,24 @@ T7(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S%F=AR%RD=0)
 U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FB-105%TG=FF%CD=S)
 
+# Cisco IOS Software, C2960C Software (C2960c405ex-UNIVERSALK9-M), Version 15.2(2)E3, RELEASE SOFTWARE (fc3)
+Fingerprint Cisco Catalyst 2960 switch (IOS 15.2)
+Class Cisco | IOS | 15.X | switch
+CPE cpe:/o:cisco:ios:15.2 auto
+SEQ(SP=F8-102%GCD=1-6%ISR=104-10E%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=Y%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)
+
 # Product/Model Number: AIR-AP1042N-R-K9, Version 15.2(4)JA1
 Fingerprint Cisco Aironet 1042N WAP (IOS 15.2)
 Class Cisco | IOS | 15.X | WAP
@@ -17107,6 +17294,24 @@ 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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# NX-OS 7.2(0)D1(1)  Nexus 7706 Chassis with N77-SUP2E supervisor
+Fingerprint Cisco Nexus switch (NX-OS 7.2)
+Class Cisco | NX-OS | 7.X | switch
+CPE cpe:/o:cisco:nx_os:7.2 auto
+SEQ(SP=FA-104%GCD=1-6%ISR=108-112%TI=I%CI=I%II=RI%SS=S%TS=3)
+OPS(O1=M218NNT11%O2=M218NNT11%O3=M218NNT11%O4=M218NNT11%O5=M218NNT11%O6=M109NNT11)
+WIN(W1=47F4%W2=47F4%W3=4998%W4=49B0%W5=49B0%W6=4A1F)
+ECN(R=Y%DF=N%T=3C-46%TG=40%W=4CC0%O=M218%CC=N%Q=)
+T1(R=Y%DF=N%T=3C-46%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=I%RUCK=0%RUD=G)
+IE(DFI=S%T=FB-105%TG=FF%CD=S)
+
 # Cisco Nexus V1000 Virtual Switch
 Fingerprint Cisco Nexus V1000 switch (NX-OS)
 Class Cisco | NX-OS || switch
@@ -20035,10 +20240,11 @@ U1(R=N)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Dell iDRAC7 (v1.56.55), "CIFS VFS Client for Linux" running on "Linux version 2.6.30"
+# iDRAC 7 running on IDRAC-T320
 Fingerprint Dell Integrated Remote Access Controller (iDRAC7)
 Class Dell | embedded || remote management
 CPE cpe:/h:dell:remote_access_card:7
-SEQ(SP=103-10D%GCD=1-6%ISR=108-112%TI=Z%CI=Z%II=I%TS=7)
+SEQ(SP=FD-10D%GCD=1-6%ISR=108-112%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW4%O2=M5B4ST11NW4%O3=M5B4NNT11NW4%O4=M5B4ST11NW4%O5=M5B4ST11NW4%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=M5B4NNSNW4%CC=N%Q=)
@@ -21348,6 +21554,26 @@ T7(R=Y%DF=Y%T=FA-104%TG=FF%W=4000%S=A%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=1E6C%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
+# Drobo5N firmware v 3.3.0 [8.75.76511] (extracted 3.2.27 kernel)
+Fingerprint Drobo5N NAS (Linux 3.2)
+Class Drobo | embedded || storage-misc
+CPE cpe:/h:drobo:5n
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3.2 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=105-10F%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW5%O2=M5B4ST11NW5%O3=M5B4NNT11NW5%O4=M5B4ST11NW5%O5=M5B4ST11NW5%O6=M5B4ST11)
+WIN(W1=3890%W2=3890%W3=3890%W4=3890%W5=3890%W6=3890)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3908%O=M5B4NNSNW5%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=O%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=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+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)
+
 # DVTel DVT-9540DW Network Camera
 Fingerprint DVTel DVT-9540DW network camera
 Class DVTel | embedded || webcam
@@ -22634,10 +22860,10 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # SysName: X450e-48p, Primary ver: 12.0.3.16, Secondary ver: 15.3.1.4, primary.cfg Created by ExtremeXOS version 15.3.1.4
 # Extreme Networks | ExtremeXOS | 15.X | switch
 # Model X670V-48t
-Fingerprint Extreme Networks Summit X450e or X670V switch (ExtremeXOS 15.3)
+Fingerprint Extreme Networks Summit X440, X450e, or X670V switch (ExtremeXOS 15.3)
 Class Extreme Networks | ExtremeXOS | 15.X | switch
 CPE cpe:/o:extremenetworks:extremexos:15.3 auto
-SEQ(SP=C0-D0%GCD=1-6%ISR=C7-D1%TI=Z%CI=Z%II=I%TS=7)
+SEQ(SP=C0-D0%GCD=1-6%ISR=C7-D3%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5B4NNT11NW5%O2=M5B4NNT11NW5%O3=M5B4NNT11NW5%O4=M5B4NNT11NW5%O5=M5B4NNT11NW5%O6=M5B4NNT11)
 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=M5B4NW5%CC=N%Q=)
@@ -22858,23 +23084,6 @@ T7(R=N)
 U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=8AA1%RUD=G)
 IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
-# F5 BIG IP LTM load balancer running OS version 9.1.0.3.0, Linux kernel version 2.4.21.
-Fingerprint F5 BIG-IP Local Traffic Manager load balancer
-Class F5 Networks | embedded || load balancer
-SEQ(SP=C1-CB%GCD=1-6%ISR=C4-CE%TI=Z%II=I%TS=7)
-OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%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=M5B4NNSNW0%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=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=Y%T=FA-104%TG=FF%CD=S)
-
 # F5 load balancer, Model 3600, OS v11.1.3.
 Fingerprint F5 3600 LTM load balancer
 Class F5 Networks | TMOS | 11.1.X | load balancer
@@ -22911,6 +23120,42 @@ T7(R=N)
 U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
+# LTM 11.6
+Fingerprint F5 BIG-IP Local Traffic Manager load balancer (TMOS 11.6)
+Class F5 Networks | TMOS | 11.6.X | load balancer
+CPE cpe:/o:f5:tmos:11.6 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=103-10F%TI=RD%CI=RI%TS=A)
+OPS(O1=M5B4NNT11SLL%O2=M5B4NNT11SLL%O3=M5B4NNT11%O4=M5B4NNT11SLL%O5=M5B4NNT11SLL%O6=M5B4NNT11SLL)
+WIN(W1=111C%W2=1068%W3=780%W4=648%W5=648%W6=31B)
+ECN(R=Y%DF=Y%T=FA-104%TG=FF%W=111C%O=M5B4SLL%CC=N%Q=)
+T1(R=Y%DF=Y%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=Y%T=FA-104%TG=FF%CD=S)
+
+# F5 BIG IP LTM load balancer running OS version 9.1.0.3.0, Linux kernel version 2.4.21.
+Fingerprint F5 BIG-IP Local Traffic Manager load balancer
+Class F5 Networks | TMOS | 9.1.X | load balancer
+CPE cpe:/o:f5:tmos:9.1 auto
+SEQ(SP=C1-CB%GCD=1-6%ISR=C4-CE%TI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%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=M5B4NNSNW0%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=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=Y%T=FA-104%TG=FF%CD=S)
+
 # http://www.firebrick.co.uk/products_2700.php
 Fingerprint FireBrick FB2700 firewall
 Class FireBrick | embedded || firewall
@@ -23435,6 +23680,24 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# FreeBSD 10.1-RELEASE-p10 FreeBSD 10.1-RELEASE-p10 #0: Tue May 12 19:33:13 UTC 2015
+Fingerprint FreeBSD 10.1-RELEASE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.1 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=21)
+OPS(O1=M574NW6ST11%O2=M574NW6ST11%O3=M280NW6NNT11%O4=M574NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M574NW6SLL%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=FFFF%S=O%A=S+%F=AS%O=M109NW6ST11%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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 10.1-RELEASE-p10 FreeBSD 10.1-RELEASE-p10 #0 r282897M: Thu May 14 15:53:59 CEST 2015     root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64  amd64
 # FreeBSD 9.3-RELEASE-p9
 Fingerprint NAS4Free (FreeBSD 9.3-RELEASE - 10.1-RELEASE)
@@ -23455,11 +23718,30 @@ 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=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# FreeBSD 10.2-RELEASE-p7 FreeBSD 10.2-RELEASE-p7 #0 r290499M: root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64  amd64
+Fingerprint FreeBSD 10.2-RELEASE (NAS4Free)
+Class FreeBSD | FreeBSD | 10.X | storage-misc
+CPE cpe:/o:freebsd:freebsd:10.2 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=103-10D%TI=I%II=I%SS=S%TS=21)
+OPS(O1=M5B4NW9ST11%O2=M578NW9ST11%O3=M280NW9NNT11%O4=M218NW9ST11%O5=M218NW9ST11%O6=M109ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW9SLL%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=N)
+T4(R=N)
+T5(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r286947: Wed Aug 19 18:04:27 MDT 2015 arm
+# FreeBSD 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r289846: Fri Oct 23 23:34:46 UTC 2015 powerpc
 Fingerprint FreeBSD 11.0-CURRENT
 Class FreeBSD | FreeBSD | 11.X | general purpose
 CPE cpe:/o:freebsd:freebsd:11.0 auto
-SEQ(SP=102-10C%GCD=1-6%ISR=106-110%TI=Z%CI=Z%II=RI%TS=21)
+SEQ(SP=102-10C%GCD=1-6%ISR=106-110%TI=Z%CI=Z%II=RI%TS=21|22)
 OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5B4NW6ST11%O5=M218NW6ST11%O6=M109ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW6SLL%CC=N%Q=)
@@ -25094,6 +25376,7 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%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=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Deletion candidate: too broad
 # FreeBSD 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Sun Apr 27 21:47:56 EDT 2008 i386
 # FreeBSD 7.0-STABLE FreeBSD 7.0-STABLE #8: Tue Apr 29 11:35:56 CEST 2008 i386
 # FreeBSD 7.0-RELEASE-p3 FreeBSD 7.0-RELEASE-p3 #7: Sun Jul 13 21:02:29 PDT 2008 i386
@@ -25123,7 +25406,7 @@ Class FreeBSD | FreeBSD | 9.X | general purpose
 CPE cpe:/o:freebsd:freebsd:9 auto
 Class FreeBSD | FreeBSD | 10.X | general purpose
 CPE cpe:/o:freebsd:freebsd:10 auto
-SEQ(SP=EC-10E%GCD=1-6%ISR=FC-112%TI=I%CI=I%II=I%SS=S%TS=20|21|22)
+SEQ(SP=EC-10E%GCD=1-6%ISR=FC-112%TI=I|RI%CI=I%II=I%SS=S%TS=20|21|22)
 OPS(O1=M5B4NW1ST11|M5B4NW2ST11|M5B4NW3ST11|M5B4NW4ST11|M5B4NW5|M5B4NW6ST11|M5B4NW9ST11%O2=M578NW1ST11|M578NW2ST11|M578NW3ST11|M578NW4ST11|M578NW5|M578NW6ST11|M578NW9ST11%O3=M280NW1NNT11|M280NW2NNT11|M280NW3NNT11|M280NW4NNT11|M280NW5|M280NW6NNT11|M280NW9NNT11%O4=M2378NW6ST11|M5B4NW1ST11|M5B4NW2ST11|M5B4NW3ST11|M5B4NW4ST11|M5B4NW5|M5B4NW6ST11|M5B4NW9ST11%O5=M218NW1ST11|M218NW2ST11|M218NW3ST11|M218NW4ST11|M218NW5|M218NW6ST11|M218NW9ST11%O6=M109ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL|M5B4NW2SLL|M5B4NW3SLL|M5B4NW4SLL|M5B4NW5|M5B4NW6SLL|M5B4NW9SLL%CC=N%Q=)
@@ -27400,6 +27683,26 @@ 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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# Android 4.1.X
+Fingerprint Android 4.1 (Linux 3.0)
+Class Google | Android | 4.1.X | phone
+CPE cpe:/o:google:android:4.1 auto
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3.0 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=106-110%TI=Z%CI=Z%II=I%TS=6)
+OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
+WIN(W1=3890%W2=3890%W3=3890%W4=3890%W5=3890%W6=3890)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3908%O=M5B4NNSNW6%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # 4.1.1 Version. HTC One S with MaximusHD 10 Custom ROM (CPU Snapdragon S4)
 # Android 4.1.2, Kernel 3.4.0-gf698891 root@abm029 #1 SMP PREEMPT
 Fingerprint Android 4.1 (Linux 3.4)
@@ -27609,6 +27912,24 @@ 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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# Android 4.4.2 on Huawei phone
+Fingerprint Android 4.4.2
+Class Google | Android | 4.4.X | phone
+CPE cpe:/o:google:android:4.4.2 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=102-10C%TI=Z%CI=I|RD%II=I%TS=7)
+OPS(O1=M550ST11NW6%O2=M550ST11NW6%O3=M550NNT11NW6%O4=M550ST11NW6%O5=M550ST11NW6%O6=M550ST11)
+WIN(W1=ECF4%W2=ECF4%W3=ECF4%W4=ECF4%W5=ECF4%W6=ECF4)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=EF10%O=M550NNSNW6%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Google Android 4.X
 Fingerprint Android 4
 Class Google | Android | 4.X | phone
@@ -27664,14 +27985,55 @@ 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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# Android 4.2.2
+Fingerprint Android 4.2.2 (Linux 3.4)
+Class Google | Android | 4.X | phone
+CPE cpe:/o:google:android:4.2.2 auto
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3.4 auto
+SEQ(SP=FA-104%GCD=1-6%ISR=FE-108%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW2%O2=M5B4ST11NW2%O3=M5B4NNT11NW2%O4=M5B4ST11NW2%O5=M5B4ST11NW2%O6=M5B4ST11)
+WIN(W1=32E8%W2=32E8%W3=32E8%W4=32E8%W5=32E8%W6=32E8)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3354%O=M5B4NNSNW2%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# Android 5.0.2
+# Android Lollipop 5.0.2 on Samsung Galaxy Tab S - T800
+# Sony Z3 Compact. Android 5.1.1
+Fingerprint Android 5.0 - 5.1
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5
+SEQ(SP=FF-10B%GCD=1-6%ISR=106-110%TI=Z%CI=I|Z%II=I%TS=7|8)
+OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NNSNW7%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Cyanogenmod nightlies
 # Linux 3.10.49-g38a3dc5c hudsoncm@ilclbld52 #1 Fri Jun 19 23:31:27 CDT 2015 (Android 5.1)
+# ASUS Zenfone 5, when used as wifi router (SEQ.CI=Z)
 Fingerprint Android 5.0 - 5.1 (Linux 3.10)
 Class Google | Android | 5.X | phone
 CPE cpe:/o:google:android:5 auto
 Class Linux | Linux | 3.X | phone
 CPE cpe:/o:linux:linux_kernel:3.10 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=109-113%TI=Z%CI=I|RD%II=I%TS=7)
+SEQ(SP=100-10A%GCD=1-6%ISR=103-113%TI=Z%CI=I|Z|RD%II=I%TS=7)
 OPS(O1=M5B4ST11NW8%O2=M5B4ST11NW8%O3=M5B4NNT11NW8%O4=M5B4ST11NW8%O5=M5B4ST11NW8%O6=M5B4ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NNSNW8%CC=Y%Q=)
@@ -27703,25 +28065,6 @@ 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)
 
-# Android 5.0.2
-# Android Lollipop 5.0.2 on Samsung Galaxy Tab S - T800
-Fingerprint Android 5.0.2
-Class Google | Android | 5.X | phone
-CPE cpe:/o:google:android:5.0.2
-SEQ(SP=FF-10B%GCD=1-6%ISR=106-110%TI=Z%CI=I|Z%II=I%TS=7|8)
-OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NNSNW7%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Android 5.1 Stock version
 # CyanogenMod 12.1
 Fingerprint Android 5.1
@@ -29924,6 +30267,25 @@ T7(R=N)
 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)
 
+# HP LaserJet 400 MFP M425dn
+Fingerprint HP LaserJet M425dn or M2727nf printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_m425dn
+CPE cpe:/h:hp:laserjet_m2727nf
+SEQ(SP=AA-B4%GCD=1-6%ISR=A5-B3%TI=I|RD%CI=I%II=I%SS=S%TS=A|B)
+OPS(O1=M548NW0NNSNNT11%O2=M548NW0NNSNNT11%O3=M280NW0NNT11%O4=M548NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=24A4%W2=24A4%W3=2258%W4=24A4%W5=20C0%W6=209D)
+ECN(R=Y%DF=Y%T=3C-46%TG=40%W=24F8%O=M548NW0NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=3C-46%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=FB-105%TG=FF%CD=S)
+
 # HP LaserJet 400 color M451dn
 # It's a Color Laserjet CP4525
 Fingerprint HP LaserJet M451dn, CM1415fnw, or CP4525
@@ -29979,6 +30341,24 @@ 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=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)
 
+# HP LaserJet P1102w printer
+Fingerprint HP LaserJet P1102w printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_p1102w auto
+SEQ(SP=B8-C2%GCD=1-6%ISR=B2-BC%TI=RD|RI%II=I%TS=A)
+OPS(O1=M5B4NNSNNT11%O2=M578NNSNNT11%O3=M280NNT11%O4=M5B4NNSNNT11%O5=M218NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=2238%O=M5B4NNS%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=N)
+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=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)
+
 # HP LaserJet Professional P1606dn
 Fingerprint HP LaserJet P1606dn printer
 Class HP | embedded || printer
@@ -30269,6 +30649,24 @@ T7(R=N)
 U1(R=N)
 IE(R=N)
 
+# HP Officejet Pro 8500 A909g
+Fingerprint HP Officejet Pro 8500 printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:officejet_pro_8500 auto
+SEQ(SP=7C-88%GCD=1-6%ISR=A1-AB%TI=RD%II=I%TS=A)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=B50%W2=AD8%W3=9D0%W4=B50%W5=830%W6=8E5)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=B68%O=M5B4NW0NNS%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=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=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)
+
 # HP Photosmart 5520
 Fingerprint HP Photosmart 5520 printer
 Class HP | embedded || printer
@@ -30531,8 +30929,9 @@ 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)
 
 # HP Onboard Administrator, Firmware Version 2.04
-Fingerprint HP Onboard Administrator management console
+Fingerprint HP Onboard Administrator 2.04
 Class HP | embedded || remote management
+CPE cpe:/a:hp:onboard_administrator:2.04
 SEQ(SP=C4-CE%GCD=1-6%ISR=C8-D2%TI=Z%II=I%TS=8)
 OPS(O1=M5B4ST11NW1%O2=M5B4ST11NW1%O3=M5B4NNT11NW1%O4=M5B4ST11NW1%O5=M5B4ST11NW1%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
@@ -30553,8 +30952,9 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # BladeSystem c7000 Onboard Administrator
 # Onboard Administrator card supporting a blade enclosure (c7000/3000).
 # HP BladeSystem Onboard administrator firmware version 3.31
-Fingerprint HP Onboard Administrator remote management for BladeSystem server enclosures
+Fingerprint HP Onboard Administrator 2.25 - 3.31
 Class HP | embedded || remote management
+CPE cpe:/a:hp:onboard_administrator
 SEQ(SP=C4-D0%GCD=1-6%ISR=CB-D5%TI=Z%II=I%TS=8)
 OPS(O1=M5B4NNT11NW1|M5B4NNT11NW3|M5B4NNT11NW6%O2=M5B4NNT11NW1|M5B4NNT11NW3|M5B4NNT11NW6%O3=M5B4NNT11NW1|M5B4NNT11NW3|M5B4NNT11NW6%O4=M5B4NNT11NW1|M5B4NNT11NW3|M5B4NNT11NW6%O5=M5B4NNT11NW1|M5B4NNT11NW3|M5B4NNT11NW6%O6=M5B4NNT11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
@@ -30569,10 +30969,29 @@ 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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# BladeSystem c7000 Onboard Administrator, 4.01 Aug 24 2013
+Fingerprint HP Onboard Administrator 4.01
+Class HP | embedded || remote management
+CPE cpe:/a:hp:onboard_administrator:4.01
+SEQ(SP=102-10C%GCD=1-6%ISR=105-10F%TI=Z%CI=Z%II=I%TS=8)
+OPS(O1=M5B4NNT11NW1%O2=M5B4NNT11NW1%O3=M5B4NNT11NW1%O4=M5B4NNT11NW1%O5=M5B4NNT11NW1%O6=M5B4NNT11)
+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=M5B4NW1%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # HP BladeSystem Onboard Administrator Firmware 4.12
 # HP BladeSystem Onboard Administrator
-Fingerprint HP Onboard Administrator remote management for BladeSystem server enclosures
+Fingerprint HP Onboard Administrator 4.12
 Class HP | embedded || remote management
+CPE cpe:/a:hp:onboard_administrator:4.12
 SEQ(SP=FB-107%GCD=1-6%ISR=FD-111%TI=Z%CI=Z%II=I%TS=8)
 OPS(O1=M5B4NNT11NW2|M5B4NNT11NW6%O2=M5B4NNT11NW2|M5B4NNT11NW6%O3=M5B4NNT11NW2|M5B4NNT11NW6%O4=M5B4NNT11NW2|M5B4NNT11NW6%O5=M5B4NNT11NW2|M5B4NNT11NW6%O6=M5B4NNT11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
@@ -31304,6 +31723,24 @@ 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=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)
 
+# HP Procurve 3500yl firmware version K.15.16.0008
+Fingerprint HP ProCurve 3500yl switch
+Class HP | embedded || switch
+CPE cpe:/h:hp:procurve_switch_3500yl auto
+SEQ(SP=81-8B%GCD=1-6%ISR=91-9B%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW1NNSNNT11%O2=M578NW1NNSNNT11%O3=M280NW1NNT11%O4=M23C6NW1NNSNNT11%O5=M218NW1NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW1NNS%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=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=00-05%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=00-05%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=00-05%TG=20%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)
+
 # HP Procurve 3500 YL
 # UTStarcom F1000, Firmware Version: 4.50st
 # ProCurve J8697A Switch 5406zl, revision K.13.25
@@ -32118,6 +32555,24 @@ T7(R=N)
 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)
 
+# HP iLO 4.X
+Fingerprint HP iLO 4 remote management interface
+Class HP | iLO | 4.X | remote management
+CPE cpe:/o:hp:ilo:4 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=106-110%CI=I%II=I%TS=A)
+OPS(O1=M537NW0NNSNNT11%O2=M537NW0NNSNNT11%O3=M280NW0NNT11%O4=M537NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=33AE%W2=33AE%W3=3110%W4=32E8%W5=3120%W6=306D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3426%O=M537NW0NNS%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=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=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)
+
 # Management Interface - iLO = integrated LightsOut (LightsOut 100i Standard, HP Proliant DL 140 G3)
 Fingerprint HP iLO 100i Standard remote management interface
 Class HP | iLO || remote management
@@ -32824,6 +33279,24 @@ T7(R=Y%DF=N%T=F9-103%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=F9-103%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=F9-103%TG=FF%CD=S)
 
+# model: HG8240, software ver.: V1R006C00S122
+Fingerprint Huawei HG8240 GPON ONT
+Class Huawei | embedded || broadband router
+CPE cpe:/h:huawei:hg8240
+SEQ(SP=C3-CD%GCD=1-6%ISR=CF-D9%TI=Z%CI=Z%TS=U)
+OPS(O1=M5B4NNSNW1%O2=M5B4NNSNW1%O3=M5B4NW1%O4=M5B4NNSNW1%O5=M5B4NNSNW1%O6=M5B4NNS)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1%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=16D0%S=O%A=S+%F=AS%O=M5B4NNSNW1%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=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)
+
 # Zoom X5 ADSL Modem (CastleNet AS80x branded as a ZoomX5 ADSL Modem)
 # ZTE ZXDSL 831 ADSL MODEM
 # ADSL/Modem Tenda TED8620R, ** Welcome to Viking **, GlobespanVirata Inc., Software Release VIK-2.1.041001a
@@ -33046,6 +33519,24 @@ 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=S%T=FA-104%TG=FF%CD=S)
 
+# Huawei VRP 3.X
+Fingerprint Huawei VRP 3 switch
+Class Huawei | VRP | 3.X | switch
+CPE cpe:/o:huawei:vrp:3 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=107-111%TI=I%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=2000%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=2000%S=A%A=Z%F=R%RD=0)
+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=S%T=F9-103%TG=FF%CD=S)
+
 # HWg-STE Ethernet thermometer/hygrometer http://www.hw-group.com
 Fingerprint HW group HWg-STE Ethernet thermometer
 Class HW group | embedded || specialized
@@ -34672,6 +35163,24 @@ 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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# IBM Power8 server running i5/OS Version 7R2
+Fingerprint IBM i5/OS V7R2
+Class IBM | i5/OS | V7 | general purpose
+CPE cpe:/o:ibm:i5os:v7 auto
+SEQ(SP=8B-AD%GCD=1-6|10|20|30|40|50%ISR=A4-B8%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW0NNT11%O2=M578NW0NNT11%O3=M280NW0NNT11%O4=M5B4NW0NNT11%O5=M218NW0NNT11%O6=M109NNT11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # OS/2 Warp 3.0
 Fingerprint IBM OS/2 Warp 3.0
 Class IBM | OS/2 | 3.X | general purpose
@@ -34708,6 +35217,24 @@ 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=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# IBM OS/2 4.X
+Fingerprint IBM OS/2 Warp 4
+Class IBM | OS/2 | 4.X | general purpose
+CPE cpe:/o:ibm:os2:4 auto
+SEQ(SP=C-16%GCD=3200|6400|9600|C800|FA00%ISR=97-A1%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=7000%W2=7000%W3=7000%W4=7000%W5=7000%W6=7000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=7000%O=M5B4%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=7000%S=O%A=O%F=A%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=7000%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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # OS/2 V4 Warp with Fixpack 15
 Fingerprint IBM OS/2 Warp 4.0 (FixPak 15)
 Class IBM | OS/2 | 4.X | general purpose
@@ -35267,6 +35794,24 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%RD=0)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# zOS 2.1
+Fingerprint IBM z/OS 2.1
+Class IBM | z/OS | 2.1.X | general purpose
+CPE cpe:/o:ibm:zos:2.1 auto
+SEQ(SP=101-10B%GCD=2|4|6|8|A%ISR=100-10A%TI=I|RD%CI=I%II=I%SS=S%TS=A|B)
+OPS(O1=M5ACNW5T11NN%O2=M5ACNW5T11NN%O3=M5ACNW5T11NN%O4=M5ACNW5T11NN%O5=M5ACNW5T11NN%O6=M5ACT11NN)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5ACNW5%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5ACNW5T11NN%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # IBM z/OS v1r8
 Fingerprint IBM z/OS v1r8
 Class IBM | z/OS || general purpose
@@ -35698,6 +36243,26 @@ T7(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=1B-25%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=1B-25%TG=20%CD=S)
 
+# Iomega StorCenter IX-4 200d, Linux 2.6.31.8 #1 Fri Apr 10 14:29:47 EDT 2015 armv5tel GNU/Linux
+Fingerprint Iomega StorCenter ix4-200d (Linux 2.6.31)
+Class Iomega | embedded || storage-misc
+CPE cpe:/h:iomega:ix4-200d
+Class Linux | Linux | 2.6.X | general purpose
+CPE cpe:/o:linux:linux_kernel:2.6.31 auto
+SEQ(SP=C8-D2%GCD=1-6%ISR=C9-D3%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW5%O2=M5B4ST11NW5%O3=M5B4NNT11NW5%O4=M5B4ST11NW5%O5=M5B4ST11NW5%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=M5B4NNSNW5%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # ION Networks SA5600 Appliance - Linux 2.6.14 based
 Fingerprint ION Networks SA5600-series firewall
 Class ION Networks | embedded || firewall
@@ -37113,6 +37678,24 @@ 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)
 
+# 2PK_2000.001.102
+Fingerprint Kyocera ECOSYS M2030dn printer
+Class Kyocera | embedded || printer
+CPE cpe:/h:kyocera:ecosys_m2030dn auto
+SEQ(SP=B4-C6%GCD=1-6%ISR=BF-C9%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M558ST11NW1%O2=M558ST11NW1%O3=M558NNT11NW1%O4=M558ST11NW1%O5=M558ST11NW1%O6=M558ST11)
+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=M558NNSNW1%CC=Y%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=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%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Kyocera ep 470dn
 Fingerprint Kyocera EP 470DN printer
 Class Kyocera | embedded || printer
@@ -37356,6 +37939,24 @@ T7(R=N)
 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)
 
+# Lanier Pro 8100s
+Fingerprint Lanier Pro 8100s printer
+Class Lanier | embedded || printer
+CPE cpe:/h:lanier:pro_8100s auto
+SEQ(SP=FA-104%GCD=1-6%ISR=101-10B%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M564NW0NNT01%O2=M564NW0NNT01%O3=M564NW0NNT01%O4=M564NW0NNT01%O5=M564NW0NNT01%O6=M564NNT01)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M564NW0%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=N%T=3B-45%TG=40%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+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)
+
 # Lanier LS232c Multifunction Printer
 # Panasonic Network Camera Model Number BL-C1CE
 # Panasonic BL-C10CE, Firmware(Boot)  1.25, Firmware(Application)   1.25
@@ -37744,6 +38345,24 @@ 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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# Lenel LNL-2220
+Fingerprint Lenel LNL-2220 access control board
+Class Lenel | embedded || security-misc
+CPE cpe:/h:lenel:lnl-2220
+SEQ(SP=FA-104%GCD=1-6%ISR=FE-108%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4SNL%O2=M5B4SNL%O3=M5B4SNL%O4=M5B4SNL%O5=M5B4SNL%O6=)
+WIN(W1=3354%W2=3354%W3=3354%W4=3354%W5=3354%W6=0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3354%O=M5B4SNL%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=Z)
+
 # Lenel LNL-3300 Intelligent System Controller (electronic door access controller)
 Fingerprint Lenel LNL-3300 access control board
 Class Lenel | embedded || security-misc
@@ -55472,12 +56091,13 @@ 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)
 
 # Huawei HG8245T GPON ONU
-Fingerprint Huawei HG8245T GPON ONU WAP
+# Linux version 2.6.21.7-hrt1 (wangqian@suse-ssmp-server) (gcc version 4.1.2 (Wind River Linux Sourcery G++ 4.1-84)) #28 Thu Sep 27 11:06:55 HKT 2012
+Fingerprint Huawei HG8245T GPON ONU WAP (Linux 2.6.21)
 Class Linux | Linux | 2.6.X | WAP
-CPE cpe:/o:linux:linux_kernel:2.6 auto
+CPE cpe:/o:linux:linux_kernel:2.6.21 auto
 Class Huawei | embedded || WAP
 CPE cpe:/h:huawei:hg8245t
-SEQ(SP=C3-CD%GCD=1-6%ISR=CE-D8%TI=Z%CI=Z%TS=U)
+SEQ(SP=C3-CD%GCD=1-6%ISR=C8-D8%TI=Z%CI=Z%II=I%TS=U)
 OPS(O1=M5B4NNSNW2%O2=M5B4NNSNW2%O3=M5B4NW2%O4=M5B4NNSNW2%O5=M5B4NNSNW2%O6=M5B4NNS)
 WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW2%CC=N%Q=)
@@ -68477,6 +69097,24 @@ 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 8.1 Enterprise
+Fingerprint Microsoft Windows 8.1 Enterprise
+Class Microsoft | Windows | 8.1 | general purpose
+CPE cpe:/o:microsoft:windows_8.1 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=104-10E%TI=I%CI=I%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=3B-45%TG=40%W=2000%O=M5B4NW8NNS%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=O%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=O%F=R%O=%RD=0%Q=)
+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=Z)
+
 # Windows 8.1 Pro x64, version 6.3 (Build 9600)
 Fingerprint Microsoft Windows 8.1 Update 1
 Class Microsoft | Windows | 8.1 | general purpose