diff --git a/nmap-os-db b/nmap-os-db
index 516eb437b..e73822e28 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -10,7 +10,7 @@
 # interest in the data to Insecure.Com LLC so it can modified,
 # incorporated into Nmap, relicensed, etc.
 #
-# This collection of fingerprint data is (C) 1996-2010 by Insecure.Com
+# This collection of fingerprint data is (C) 1996-2017 by Insecure.Com
 # LLC.  It is distributed under the Nmap Open Source license as
 # provided in the COPYING file of the source distribution or at
 # https://nmap.org/data/COPYING .  Note that this license
@@ -1031,6 +1031,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|Y%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N|O|S|Y%T=3B-45%TG=40%CD=Z)
 
+# 3M CT-30 HVAC Thermostat
+Fingerprint 3M CT-30 thermostat
+Class 3M | embedded || specialized
+CPE cpe:/h:3m:ct-30
+SEQ(SP=DF-103%GCD=1-6%ISR=EC-FE%TI=I|RD%CI=I%II=I%SS=O%TS=A|D)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=%O6=)
+WIN(W1=B50%W2=AD8%W3=9D0%W4=B50%W5=0%W6=0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=B68%O=M5B4NW0NNS%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)
+
 # Radio Thermostat from Filtrete model CT50 V1.92 API version 113 Firmware version 1.04.72 www.radiothermostat.com
 # 3M Radio Thermostat Company of America - Filterete 3m-50
 Fingerprint 3M Filtrete 3M-50 thermostat
@@ -9730,7 +9748,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 Fingerprint Belkin N600 DB WAP
 Class Belkin | embedded || WAP
 CPE cpe:/h:belkin:n600_db
-SEQ(SP=CF-123%GCD=1-6%ISR=EA-100%TI=Z%CI=Z%II=I%TS=7)
+SEQ(SP=CF-123%GCD=1-6%ISR=E8-100%TI=Z%CI=Z%II=I%TS=7)
 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)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1%CC=N)
@@ -11781,6 +11799,24 @@ T7(R=Y%DF=N%T=6F%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=6F%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=164B%RUD=G)
 IE(DFI=N%T=6F%TG=80%CD=Z)
 
+# Brother MFC-9970CDW Firmware Version P-1.10
+Fingerprint Brother MFC-9970CDW printer
+Class Brother | embedded || printer
+CPE cpe:/h:brother:mfc-9970cdw auto
+SEQ(SP=8-12%GCD=30D4|61A8|927C|C350|F424%ISR=9C-A6%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=3B-45%TG=40%W=2238%O=M5B4NW0NNS%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=209D%S=O%A=S+%F=AS%O=M109NW0NNSNNT11%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=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 MFC-J415W
 Fingerprint Brother MFC-J415W printer
 Class Brother | embedded || printer
@@ -13261,6 +13297,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=Y%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=Y%T=3B-45%TG=40%CD=S)
 
+# AireOS 8.0.140.0
+Fingerprint Cisco AireOS 8.0.140.0
+Class Cisco | AireOS | 8.X | remote management
+CPE cpe:/o:cisco:aireos:8.0.140.0 auto
+SEQ(SP=BA-C4%GCD=1-6%ISR=CA-D4%TI=I%CI=I%II=RI%SS=S%TS=8)
+OPS(O1=M56EST11NW7%O2=M56EST11NW7%O3=M56ENNT11NW7%O4=M56EST11NW7%O5=M56EST11NW7%O6=M56EST11)
+WIN(W1=1588%W2=1588%W3=1588%W4=1588%W5=1588%W6=1588)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=15B8%O=M56ENNSNW7%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=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=EB-F5%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=EB-F5%TG=FF%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=S%T=7B-85%TG=80%CD=S)
+
 # AireOS 8.2.130.0, Linux 2.6.21_mvlcge500-octeon-mips64_octeon_v2_be
 Fingerprint Cisco AireOS 8.2 (Linux 2.6.21)
 Class Cisco | AireOS | 8.X | remote management
@@ -13281,6 +13335,28 @@ 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=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
+# AireOS 8.0.132.0
+Fingerprint Cisco 2500- or 5500-series Wireless Controller (AireOS 7 - 8)
+Class Cisco | AireOS || remote management
+CPE cpe:/o:cisco:aireos auto
+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=)
+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=N%T=EB-F5%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=EB-F5%TG=FF%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=S%T=7B-85%TG=80%CD=S)
+
 # cisco wlc 2504, version: 7.6.130.0
 # AireOS 8.0.121.0
 Fingerprint Cisco 2500-series Wireless LAN Controller (AireOS)
@@ -13300,6 +13376,79 @@ T7(R=N)
 U1(DF=N%T=3C-46%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=S)
 
+# Cisco Adaptive Security Appliance Software (ASA) Version 7.2(4)
+Fingerprint Cisco Adaptive Security Appliance (ASA 7.2)
+Class Cisco | ASA | 7.X | firewall
+CPE cpe:/a:cisco:adaptive_security_appliance_software:7.2 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=100-10A%TI=RD%II=RI%TS=U)
+OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M218)
+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=M218%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=N)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=7B-85%TG=80%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
+# cisco asa 8.4
+Fingerprint Cisco Adaptive Security Appliance (ASA 8.4)
+Class Cisco | ASA | 8.X | firewall
+CPE cpe:/a:cisco:adaptive_security_appliance_software:8.4 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=103-10D%TI=RD%II=RI%TS=U)
+OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
+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=M564%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=N)
+T5(R=N)
+T6(R=N)
+T7(R=N)
+U1(R=N)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
+# Cisco ASA 5540. ASA version 8.0(4)
+# Cisco ASA 5510.
+Fingerprint Cisco Adaptive Security Appliance 5510 or 5540 firewall (ASA 8.0)
+Class Cisco | ASA | 8.X | firewall
+CPE cpe:/a:cisco:adaptive_security_appliance_software:8.0 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=101-10B%TI=RD%CI=RD%II=RI%TS=U)
+OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
+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=M564%CC=N%Q=)
+T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=FA-104%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(R=N)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
+# Cisco Adaptive Security Appliance Software Version 9.2(4)22
+Fingerprint Cisco Adaptive Security Appliance (ASA 9.2)
+Class Cisco | ASA | 9.X | firewall
+CPE cpe:/a:cisco:adaptive_security_appliance_software:9.2 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=105-10F%TI=RD%CI=RD%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=Y%DF=N%T=FA-104%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(R=N)
+IE(R=N)
+
 # Cisco IronPort appliance C170
 # IronPort C160 Email security appliance
 Fingerprint Cisco IronPort C160 or C170 email security appliance (AsyncOS 7)
@@ -13951,26 +14100,6 @@ 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=38%UN=127|4B53|4BD7%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 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-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=)
-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=N%T=EB-F5%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=EB-F5%TG=FF%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=S%T=7B-85%TG=80%CD=S)
-
 # Cisco Wireless LAN Controller model 4402 (management port). sw version is 5.0.148.0.
 # Cisco 4400 Series Wireless LAN Controller, AIR-WLC4402-25-K9
 Fingerprint Cisco 4402 wireless LAN controller
@@ -14415,6 +14544,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=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# SG200-26 26-Port Gigabit Smart Switch, Firmware 1.2.9.44
+Fingerprint Cisco SG200 switch
+Class Cisco | embedded || switch
+CPE cpe:/h:cisco:sg200 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=108-112%TI=RD%II=RI%TS=U)
+OPS(O1=M596%O2=M596%O3=M596%O4=M596%O5=M596%O6=M596)
+WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=1000%O=M596%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)
+
 # Cisco SG250-10P
 Fingerprint Cisco SG250 switch
 Class Cisco | embedded || switch
@@ -14451,6 +14598,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=S%T=3B-45%TG=40%CD=S)
 
+# Cisco SG300-20 20-Port Gigabit Managed Switch, Firmware 1.4.7.6
+Fingerprint Cisco SG300 switch
+Class Cisco | embedded || switch
+CPE cpe:/h:cisco:sg300 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=109-113%TI=RD%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=)
+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)
+
 # HP Switch: "PROCURVE J9028B" adm Software version PB.02.09, Hardware version R01
 # HP ProCurve 1800-24G J9028B running firmware version PB.03.02
 # Cisco Small Business Switch SLM2008 Firmware Revision 2.0.0.10
@@ -16817,7 +16982,8 @@ CPE cpe:/h:cisco:catalyst_4500
 CPE cpe:/o:cisco:ios:12
 Class Cisco | IOS | 15.X | router
 CPE cpe:/o:cisco:ios:15
-Class Cisco | embedded || firewall
+Class Cisco | ASA | 9.X | firewall
+CPE cpe:/a:cisco:adaptive_security_appliance_software:9 auto
 SEQ(SP=F1-10F%GCD=1-6%ISR=FE-110%TI=RD%CI=RD|RI%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)
@@ -16934,6 +17100,24 @@ T7(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=100%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=100%TG=FF%CD=S)
 
+# Cisco IOS Software, C3560 Software, Version 12.2(25)SEE3
+Fingerprint Cisco 3500-series switch (IOS 12.2)
+Class Cisco | IOS | 12.X | switch
+CPE cpe:/o:cisco:ios:12.2 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=107-111%TI=Z%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=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%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=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 IOS Software, C3550 Software (C3550-IPBASEK9-M), Version 12.2(44)SE6, RELEASE SOFTWARE (fc1)
 Fingerprint Cisco 3550 switch (IOS 12.1)
 Class Cisco | IOS | 12.X | switch
@@ -17432,30 +17616,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 Catalyst 2960 IOS 12.2(35)SE5
-# cisco 2960 8 port switch
-# Cisco IOS Software, C3560 Software (C3560-IPBASE-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
-# Cisco IOS Software, C3750E Software (C3750E-UNIVERSAL-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
-Fingerprint Cisco Catalyst 2960, 3560, or 3750 switch (IOS 12.2)
-Class Cisco | IOS | 12.X | switch
-CPE cpe:/h:cisco:catalyst_2960
-CPE cpe:/h:cisco:catalyst_3560
-CPE cpe:/h:cisco:catalyst_3750
-CPE cpe:/o:cisco:ios:12.2
-SEQ(SP=F8-10C%GCD=1-6%ISR=102-112%TI=RD%CI=I%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=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%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=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 IOS Software, C2960 Software (C2960-LANBASE-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
 # Cisco IOS Version 12.2(18)SXF8 running on Supervisor II / MSFC II module in a Cisco Catalyst 6500 switch
 # Cisco WS-C3560-48PS
@@ -17596,25 +17756,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500-IPBASEK9-M), Version 12.2(40)SG, RELEASE SOFTWARE (fc2)
-Fingerprint Cisco Catalyst 4500 switch (IOS 12.2)
-Class Cisco | IOS | 12.X | switch
-CPE cpe:/h:cisco:catalyst_3750
-CPE cpe:/o:cisco:ios:12.2
-SEQ(SP=101-10B%GCD=1-6%ISR=109-113%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=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%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=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)
-
 # ipbase 12.2(17r)SX7 fc1 cisco 6509 sup720-10g
 Fingerprint Cisco Catalyst 6509 switch (IOS 12.2)
 Class Cisco | IOS | 12.X | switch
@@ -17732,6 +17873,29 @@ 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=S%T=FA-104%TG=FF%CD=S)
 
+# Cisco Catalyst 2960 IOS 12.2(35)SE5
+# cisco 2960 8 port switch
+# Cisco IOS Software, C3560 Software (C3560-IPBASE-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
+# Cisco IOS Software, C3750E Software (C3750E-UNIVERSAL-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
+# Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500-IPBASEK9-M), Version 12.2(40)SG, RELEASE SOFTWARE (fc2)
+# Cisco 12.2(50)SE IOS
+Fingerprint Cisco Catalyst switch (IOS 12.2)
+Class Cisco | IOS | 12.X | switch
+CPE cpe:/o:cisco:ios:12.2 auto
+SEQ(SP=F8-10C%GCD=1-6%ISR=102-113%TI=RD%CI=I|RI|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=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%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=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 1131AG wireless access point running IOS 12.3(8)JA2
 Fingerprint Cisco 1131AG WAP (IOS 12.3)
 Class Cisco | IOS | 12.X | WAP
@@ -18125,6 +18289,43 @@ T7(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%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, C880 Software (C880DATA-UNIVERSALK9-M), Version 15.5(3)M4a, RELEASE SOFTWARE (fc1)
+# Cisco IOS Software, C1250 Software (C1250-K9W7-M), Version 15.2(2)JA1, RELEASE SOFTWARE (fc1)
+Fingerprint Cisco IOS 15.2 - 15.5
+Class Cisco | IOS | 15.X | router
+CPE cpe:/o:cisco:ios:15 auto
+SEQ(SP=F7-109%GCD=1-6%ISR=FB-107%TI=RD%CI=RD%TS=A)
+OPS(O1=M5B4SNNT11LL%O2=M578SNNT11LL%O3=M280T11LL%O4=M218SNNT11LL%O5=M218SNNT11LL%O6=M109SNNT11LL)
+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=M5B4SLL%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=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%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)
+
+# C2951 Software (C2951-UNIVERSALK9-M), Version 15.5(2)T2
+Fingerprint Cisco IOS 15.5
+Class Cisco | IOS | 15.X | router
+CPE cpe:/o:cisco:ios:15.5 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=108-112%TI=RD%CI=RD%II=RI%TS=U)
+OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M218)
+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=Y%DF=N%T=FB-105%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FB-105%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=FB-105%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FB-105%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+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, 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
@@ -18538,6 +18739,24 @@ T7(R=N)
 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)
 
+# NX-OS version 5.2(1)SV3(1.5a)
+Fingerprint Cisco NX-OS 5.2
+Class Cisco | NX-OS | 5.X | switch
+CPE cpe:/o:cisco:nx_os:5.2 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=105-10F%TI=I%CI=RD%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=3B-45%TG=40%W=4CC0%O=M218%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=FB-105%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FB-105%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=FB-105%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FB-105%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+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=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)
+
 # cisco nexus 3000 switch
 Fingerprint Cisco Nexus 3000 switch (NX-OS 6)
 Class Cisco | NX-OS | 6.X | switch
@@ -18647,6 +18866,42 @@ 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=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# version 6.2(16)
+Fingerprint Cisco Nexus switch (NX-OS 6.2)
+Class Cisco | NX-OS | 6.X | switch
+CPE cpe:/o:cisco:nx_os:6.2 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=RI%SS=S%TS=3)
+OPS(O1=M5B4NNT11%O2=M578NNT11%O3=M280NNT11%O4=M23D8NNT11%O5=M218NNT11%O6=M109NNT11)
+WIN(W1=47F4%W2=47F4%W3=4998%W4=49B0%W5=49B0%W6=4A1F)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=4CC0%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=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=I%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
+# 6.2(12)
+Fingerprint Cisco Nexus switch (NX-OS 6.2)
+Class Cisco | NX-OS | 6.X | switch
+CPE cpe:/o:cisco:nx_os:6.2 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=107-111%TI=RD%CI=RD%II=RI%TS=18)
+OPS(O1=M5B4NNT11%O2=M578NNT11%O3=M280NNT11%O4=M5B4NNT11%O5=M218NNT11%O6=M109NNT11)
+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=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=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=I%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # NX-OS 6.2(7) running on a Cisco MDS 9148 Fibre Channel Switch.
 Fingerprint Cisco NX-OS 6.2
 Class Cisco | NX-OS | 6.X | switch
@@ -18758,61 +19013,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%S=A%A=S+%F=UAPR%O=WFNM109T10S%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# Cisco Adaptive Security Appliance Software (ASA) Version 7.2(4)
-Fingerprint Cisco Adaptive Security Appliance (PIX OS 7.2)
-Class Cisco | PIX OS | 7.X | firewall
-CPE cpe:/o:cisco:pix_os:7.2 auto
-SEQ(SP=FF-109%GCD=1-6%ISR=100-10A%TI=RD%II=RI%TS=U)
-OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M218)
-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=M218%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=N)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=7B-85%TG=80%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
-# cisco asa 8.4
-Fingerprint Cisco Adaptive Security Appliance (PIX OS 8.4)
-Class Cisco | PIX OS | 8.X | firewall
-CPE cpe:/o:cisco:pix_os:8.4 auto
-SEQ(SP=102-10C%GCD=1-6%ISR=103-10D%TI=RD%II=RI%TS=U)
-OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
-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=M564%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=N)
-T5(R=N)
-T6(R=N)
-T7(R=N)
-U1(R=N)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
-# Cisco ASA 5540. ASA version 8.0(4)
-# Cisco ASA 5510.
-Fingerprint Cisco Adaptive Security Appliance 5510 or 5540 firewall (PIX OS 8.0)
-Class Cisco | PIX OS | 8.X | firewall
-CPE cpe:/o:cisco:pix_os:8.0 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=101-10B%TI=RD%CI=RD%II=RI%TS=U)
-OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
-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=M564%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=FA-104%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FA-104%TG=FF%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FA-104%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(R=N)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
 # Citrix NetScaler load balancer
 Fingerprint Citrix NetScaler load balancer
 Class Citrix | embedded || load balancer
@@ -20109,6 +20309,24 @@ T7(R=Y%DF=N%T=37-41%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)
 
+# DLINK DGS-1210-10P firmware 2.02.002
+Fingerprint D-Link DGS-1210 switch
+Class D-Link | embedded || switch
+CPE cpe:/h:dlink:dgs-1210
+SEQ(SP=0-5%GCD=388|710|A98|E20|11A8%ISR=64-6E%TI=I%II=I%SS=O%TS=7)
+OPS(O1=M578NNT11%O2=M578NNT11%O3=M578NNT11%O4=M578NNT11%O5=M218NNT11%O6=M109NNT11)
+WIN(W1=2400%W2=2400%W3=2400%W4=2400%W5=2400%W6=2400)
+ECN(R=Y%DF=N%T=37-41%TG=40%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=N%T=37-41%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=37-41%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)
+
 # DGS-1510
 Fingerprint D-Link DGS-1510 switch
 Class D-Link | embedded || switch
@@ -21507,9 +21725,11 @@ U1(DF=N%T=F9-103%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=F9-104%TG=FF%CD=S)
 
 # Dell H625CDW, Fuji Xerox MAC address
-Fingerprint Dell H625CDW printer
+# Dell C2665dnf Color MFP
+Fingerprint Dell H625CDW or C2665dnf printer
 Class Dell | embedded || printer
-CPE cpe:/h:dell:h625cdw auto
+CPE cpe:/h:dell:h625cdw
+CPE cpe:/h:dell:c2665dnf
 SEQ(SP=92-BC%GCD=1-6%ISR=91-AF%TI=BI%CI=BI|RD%II=BI%SS=S%TS=U)
 OPS(O1=NNM5B4SNW0%O2=NNM5B4SNW0%O3=M5B4NW0%O4=NNM5B4SNW0%O5=NNM5B4SNW0%O6=NNM5B4S)
 WIN(W1=2710%W2=2710%W3=2710%W4=2710%W5=2710%W6=2710)
@@ -21973,6 +22193,24 @@ T7(R=N)
 U1(DF=N%T=3A-44%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3A-44%TG=40%CD=S)
 
+# Dell DR4100
+Fingerprint Dell DR4100 backup appliance
+Class Dell | embedded || storage-misc
+CPE cpe:/h:dell:dr4100
+SEQ(SP=C6-D0%GCD=1-6%ISR=CC-D6%TI=Z%CI=Z%II=I%TS=A)
+OPS(O1=M5B4ST11NWC%O2=M5B4ST11NWC%O3=M5B4NNT11NWC%O4=M5B4ST11NWC%O5=M5B4ST11NWC%O6=M5B4ST11)
+WIN(W1=FB98%W2=FB98%W3=FB98%W4=FB98%W5=FB98%W6=16A0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FC38%O=M5B4NNSNWC%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=FB98%S=O%A=S+%F=AS%O=M5B4ST11NWC%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Dell Equallogic PS4000XV
 # PS3000 SAN
 Fingerprint Dell EqualLogic PeerStorage PS3000 or PS4000 NAS device
@@ -22849,6 +23087,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)
 
+# ConnectPort TS1 W RJ MEI, firmware: 2.17.0.5 (Version 82001592_E 08/30/2013)
+Fingerprint Digi ConnectPort TS1 gateway
+Class Digi | embedded || specialized
+CPE cpe:/h:digi:connectport_ts1
+SEQ(SP=101-10B%GCD=1-6%ISR=105-10F%TI=I%CI=I|RD%II=RI%TS=A)
+OPS(O1=M553NW0NNSNNT11%O2=M553NW0NNSNNT11%O3=M280NW0NNT11%O4=M553NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=24F1%W2=24F1%W3=2258%W4=21F0%W5=20C0%W6=209D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2545%O=M553NW0NNS%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)
+
 # Digi WR44 - Sarian OS
 # Digi DR64 MKII
 Fingerprint Digi TransPort DR64 or WR44 wireless router
@@ -23143,6 +23399,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=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# DragonFly DragonFly 4.9-DEVELOPMENT DragonFly v4.9.0.16.g133414-DEVELOPMENT #0: Wed Mar 15 13:49:52 UTC 2017     root@pkgbox64.dragonflybsd.org:/usr/obj/usr/src/sys/X86_64_GENERIC  x86_64
+Fingerprint DragonFly BSD 4.9
+Class DragonFly BSD | DragonFly BSD | 4.X | general purpose
+CPE cpe:/o:dragonflybsd:dragonfly_bsd:4.9 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=FF-109%TI=Z%CI=RI%II=RI%TS=7)
+OPS(O1=M3FD8NW5NNT11NNS%O2=M3FD8NW5NNT11NNS%O3=M3FD8NW5NNT11%O4=M3FD8NW5NNT11NNS%O5=M3FD8NW5NNT11NNS%O6=M3FD8NNT11NNS)
+WIN(W1=E000%W2=E000%W3=E000%W4=E000%W5=E000%W6=E000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=E000%O=M3FD8NW5NNS%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=E000%S=O%A=S+%F=AS%O=M3FD8NW5NNT11NNS%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=Z%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # Mitel 5212 SIP Phone
 # DragonWave Horizon 24GHz radio: get sw version -> Bootloader software: NCC 1.1.0
 Fingerprint DragonWave Horizon WAP or Mitel 5212 SIP Phone
@@ -24392,6 +24666,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)
 
+# Epson XP-630 Printer
+Fingerprint Epson XP-630 printer
+Class Epson | embedded || printer
+CPE cpe:/h:epson:xp-630 auto
+SEQ(SP=C4-CE%GCD=1-6%ISR=CC-D6%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11%O2=M5B4ST11%O3=M5B4NNT11%O4=M5B4ST11%O5=M5B4ST11%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=M5B4NNS%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=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)
+
 # World Wide Packets LightningEdge (tm) LE-427 Access Distributor
 # World Wide Packets LightningEdge (tm) LE-311 Access Concentrator
 # World Wide Packets LightningEdge (tm) LE-327 Access Concentrator
@@ -24450,6 +24742,25 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=16D0%S=A%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=S)
 
+# Espressif 8266 running in a WifiStat.
+Fingerprint Espressif esp8266 firmware (lwIP stack)
+Class Espressif | embedded || specialized
+Class lwIP | lwIP || general purpose
+CPE cpe:/a:lwip_project:lwip auto
+SEQ(SP=6F-79%GCD=1-6%ISR=9B-A5%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=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=16D0%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=Y%DF=N%T=FA-104%TG=FF%W=16D0%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=16D0%S=A+%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=16D0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=16D0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=16D0%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)
+
 # Espressif ESP8266 Embedded TCP stack (Possibly lwip on FreeRTOS --ed.)
 Fingerprint Espressif ESP8266 WiFi system-on-a-chip
 Class Espressif | embedded || specialized
@@ -24740,6 +25051,24 @@ 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)
 
+# 15.3.4.6
+Fingerprint Extreme Networks ExtremeOS 15.3
+Class Extreme Networks | ExtremeXOS | 15.X | switch
+CPE cpe:/o:extremenetworks:extremexos:15 auto
+SEQ(SP=C5-CF%GCD=1-6%ISR=C8-D2%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M580NNT11NW5%O2=M580NNT11NW5%O3=M580NNT11NW5%O4=M580NNT11NW5%O5=M580NNT11NW5%O6=M580NNT11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=3A-44%TG=40%W=16D0%O=M580NW5%CC=N%Q=)
+T1(R=Y%DF=Y%T=3A-44%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3A-44%TG=40%W=16A0%S=O%A=S+%F=AS%O=M580NNT11NW5%RD=0%Q=)
+T4(R=Y%DF=Y%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3A-44%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3A-44%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3A-44%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3A-44%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
@@ -24781,6 +25110,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)
 
+# ExtremeXOS version 15.3.2.11 v1532b11
+Fingerprint Extreme Networks ExtremeXOS 15.3
+Class Extreme Networks | ExtremeXOS | 15.X | switch
+CPE cpe:/o:extremenetworks:extremexos:15.3 auto
+SEQ(SP=CA-D4%GCD=1-6%ISR=CD-D7%TI=Z%II=I%TS=7)
+OPS(O1=M576NNT11NW5%O2=M576NNT11NW5%O3=M576NNT11NW5%O4=M576NNT11NW5%O5=M576NNT11NW5%O6=M576NNT11)
+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=M576NW5%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)
+
 # ExtremeXOS 15
 # EXOS version summitX-16.1.2.14-patch1-1-ssh.xmod 16.1.2.14-patch1-1 (x460G2)
 Fingerprint Extreme Networks switch (ExtremeXOS 15 - 16)
@@ -25191,6 +25538,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=11C%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=Z)
 
+# 2.5.2.2
+Fingerprint Force10 SFTOS 2.5.2.2
+Class Force10 | SFTOS | 2.X | switch
+CPE cpe:/o:force10:sftos:2.5.2.2 auto
+SEQ(SP=8E-C6%GCD=1-6%ISR=99-B1%TI=I|RD%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
+WIN(W1=2710%W2=2710%W3=2710%W4=2710%W5=2710%W6=2710)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=2710%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=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=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S+%F=AR%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=S+%F=AR%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=3B-45%TG=40%IPL=11C%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=Z)
+
 # FORE Systems ForeThought 4.1.0 1.76
 Fingerprint FORE Systems ForeThought ATM switch
 Class FORE Systems | embedded || switch
@@ -25553,13 +25918,16 @@ 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)
 
 # System: NetIron CER Boot     : Version 5.1.0T185 Copyright (c) 1996-2009 Brocade Communications Systems, Inc.
-Fingerprint Foundry NetIron CER router
+# Brocade NetIron CER, Extended route scalability, IronWare Version V6.1.0aT183 Compiled on Mar 23 2017 at 11:20:44 labeled as V6.1.00a
+Fingerprint Brocade/Foundry NetIron CER router (IronWare 5 - 6)
 Class Foundry | IronWare | 5.X | router
 CPE cpe:/o:foundrynet:ironware:5 auto
+Class Brocade | IronWare | 6.X | router
+CPE cpe:/o:brocade:ironware:6 auto
 SEQ(SP=63-A5%GCD=1-6%ISR=71-9F%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+OPS(O1=M541|M5B4%O2=M541|M5B4%O3=M541|M5B4%O4=M541|M5B4%O5=M541|M5B4%O6=M541|M5B4)
 WIN(W1=FDE8%W2=FDE8%W3=FDE8%W4=FDE8%W5=FDE8%W6=FDE8)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=FDE8%O=M5B4%CC=N%Q=)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=FDE8%O=M541|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=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=U)
 T3(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=U)
@@ -25870,10 +26238,11 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Localhost
 # FreeBSD 11.0-RELEASE-p2 FreeBSD 11.0-RELEASE-p2 #0: Mon Oct 24 06:55:27 UTC 2016     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
+# FreeBSD udoo 11.0-RELEASE-p1 (TS=22)
 Fingerprint FreeBSD 11.0-RELEASE
 Class FreeBSD | FreeBSD | 11.X | general purpose
 CPE cpe:/o:freebsd:freebsd:11.0 auto
-SEQ(SP=101-10B%GCD=1-6%ISR=107-111%TI=Z%CI=Z%TS=21)
+SEQ(SP=FD-10B%GCD=1-6%ISR=107-111%TI=Z%CI=Z%TS=21|22)
 OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M3FD8NW6ST11%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=Y%Q=)
@@ -25909,7 +26278,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 Fingerprint FreeBSD 11.0-RELEASE
 Class FreeBSD | FreeBSD | 11.X | general purpose
 CPE cpe:/o:freebsd:freebsd:11.0 auto
-SEQ(SP=FD-107%GCD=1-6%ISR=106-110%TI=Z%II=RI%TS=22)
+SEQ(SP=FD-109%GCD=1-6%ISR=106-110%TI=Z%II=RI%TS=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=Y%Q=)
@@ -25923,15 +26292,11 @@ 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 12.0-CURRENT FreeBSD 12.0-CURRENT #0 r305028: Tue Aug 30 05:16:47 UTC 2016 root@releng3.nyi.freebsd.org:/usr/obj/arm.armv6/usr/src/sys/RPI-B  arm
-# FreeBSD 11.0-RELEASE FreeBSD 11.0-RELEASE #0 r306211: Fri Sep 23 09:16:54 UTC 2016     root@releng2.nyi.freebsd.org:/usr/obj/arm.armv6/usr/src/sys/RPI2  arm
-# FreeBSD 11.0-RELEASE-p2 FreeBSD 11.0-RELEASE-p2 #0: Mon Oct 24 06:55:27 UTC 2016     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
-Fingerprint FreeBSD 11.0-RELEASE - 12.0-CURRENT
+# FreeBSD 11.0-RELEASE-p1 FreeBSD 11.0-RELEASE-p1 #0 r306420: Thu Sep 29 01:43:23 UTC 2016     root@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
+Fingerprint FreeBSD 11.0-RELEASE
 Class FreeBSD | FreeBSD | 11.X | general purpose
-CPE cpe:/o:freebsd:freebsd:11 auto
-Class FreeBSD | FreeBSD | 12.X | general purpose
-CPE cpe:/o:freebsd:freebsd:12 auto
-SEQ(SP=FC-106%GCD=1-6%ISR=106-110%TI=Z%CI=Z%II=RI%TS=21)
+CPE cpe:/o:freebsd:freebsd:11.0 auto
+SEQ(SP=F5-FF%GCD=1-6%ISR=FC-106%TI=Z%CI=Z%II=RI%TS=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=Y%Q=)
@@ -25945,6 +26310,66 @@ 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 12.0-CURRENT FreeBSD 12.0-CURRENT #0 r305028: Tue Aug 30 05:16:47 UTC 2016 root@releng3.nyi.freebsd.org:/usr/obj/arm.armv6/usr/src/sys/RPI-B  arm
+# FreeBSD 11.0-RELEASE FreeBSD 11.0-RELEASE #0 r306211: Fri Sep 23 09:16:54 UTC 2016     root@releng2.nyi.freebsd.org:/usr/obj/arm.armv6/usr/src/sys/RPI2  arm
+# FreeBSD 11.0-RELEASE-p2 FreeBSD 11.0-RELEASE-p2 #0: Mon Oct 24 06:55:27 UTC 2016     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
+# FreeBSD 11.0-STABLE FreeBSD 11.0-STABLE #0 r313908+3f7f2032d86(freenas/11.0-stable): Thu May  4 02:25:25 UTC 2017      root@gauntlet:/freenas-9.10-releng/freenas/_BE/objs/freenas-9.10-releng/freenas/_BE/os/sys/FreeNAS.amd64  amd64
+Fingerprint FreeBSD 11.0-RELEASE - 12.0-CURRENT
+Class FreeBSD | FreeBSD | 11.X | general purpose
+CPE cpe:/o:freebsd:freebsd:11 auto
+Class FreeBSD | FreeBSD | 12.X | general purpose
+CPE cpe:/o:freebsd:freebsd:12 auto
+SEQ(SP=FC-109%GCD=1-6%ISR=106-110%TI=Z%CI=Z%II=RI%TS=21)
+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=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=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|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 11.0-STABLE FreeBSD 11.0-STABLE #0 r313908+b3722b04944(freenas/11.0-stable): Sat Jul  1 02:44:49 UTC 2017     root@gauntlet:/freenas-11-releng/freenas/_BE/objs/freenas-11-releng/freenas/_BE/os/sys/FreeNAS.amd64  amd64
+Fingerprint FreeBSD 11.0-STABLE
+Class FreeBSD | FreeBSD | 11.X | general purpose
+CPE cpe:/o:freebsd:freebsd:11.0 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=102-10C%TI=Z%CI=Z%II=RI%TS=21)
+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=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=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-STABLE FreeBSD 11.0-STABLE #1 r314703: Sun Mar  5 16:35:37 EST 2017     ?@?:/build/arm_releng_11/obj/arm.armv6/build/arm_releng_11/src/sys/BEAGLEBONE  arm
+# FreeBSD 11.0-RELEASE-p1 FreeBSD 11.0-RELEASE-p1 #0 r306420: Thu Sep 29 01:43:23 UTC 2016     root@releng2.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
+Fingerprint FreeBSD 11.0-STABLE or 11.0-RELEASE
+Class FreeBSD | FreeBSD | 11.X | general purpose
+CPE cpe:/o:freebsd:freebsd:11.0 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=101-10D%TI=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=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=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M109NW6ST11%RD=0%Q=)
+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=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-RELEASE-p7 FreeBSD 11.0-RELEASE-p7 #0 r312343M: Tue Jan 17 15:41:49 CET 2017     root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64  amd64
 Fingerprint NAS4Free (FreeBSD 11.0-RELEASE)
 Class FreeBSD | FreeBSD | 11.X | general purpose
@@ -29044,7 +29469,7 @@ Class FreeNAS | FreeNAS | 9.X | storage-misc
 CPE cpe:/o:freenas:freenas:9.10 auto
 Class FreeBSD | FreeBSD | 10.X | storage-misc
 CPE cpe:/o:freebsd:freebsd:10.3 auto
-SEQ(SP=102-10C%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=21|22)
+SEQ(SP=102-10C%GCD=1-6%ISR=105-10F%TI=I%CI=I|RD%II=I%SS=S%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=Y%Q=)
@@ -29097,6 +29522,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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Fronius Datalogger Web
+Fingerprint Fronius Datalogger Web
+Class Fronius | embedded || power-misc
+CPE cpe:/h:fronius:datalogger_web
+SEQ(SP=BC-D0%GCD=1-6%ISR=CA-D4%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M514ST11NW1%O2=M514ST11NW1%O3=M514NNT11NW1%O4=M514ST11NW1%O5=M514ST11NW1%O6=M514ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=3C-46%TG=40%W=16D0%O=M514NNSNW1%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=Y%T=3C-46%TG=40%W=16A0%S=O%A=O%F=A%O=NNT11%RD=0)
+T4(R=Y%DF=Y%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3C-46%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3C-46%TG=40%CD=S)
+
 # Audio Block CVR100+
 Fingerprint Audio Block CVR100+ internet radio
 Class Frontier Silicon | embedded || media device
@@ -30622,6 +31065,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)
 
+# vivo Android5.0.1
+Fingerprint Android 5.0.1
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5.0.1 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=105-10F%TI=Z%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=)
+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=N)
+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)
+
 # Kernel version: 3.10.61-g197daf0 Android version: 5.0.1
 Fingerprint Android 5.0.1 (Linux 3.10)
 Class Google | Android | 5.X | phone
@@ -31272,6 +31733,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=S)
 
+# Henry Argos biometric access control, model "argos2", version "1.0.1.0B"
+Fingerprint Henry Argos biometric access control
+Class Henry Electronic | embedded || security-misc
+SEQ(SP=41-4B%GCD=1-6%ISR=9D-A7%TI=I%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M276%O2=M276%O3=M276%O4=M276%O5=M276%O6=M276)
+WIN(W1=9D8%W2=9D8%W3=9D8%W4=9D8%W5=9D8%W6=9D8)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=9D8%O=M276%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=Y%DF=N%T=FA-104%TG=FF%W=9D8%S=O%A=S+%F=AS%O=M276%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=9D8%S=A+%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=9D8%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=9D8%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=9D8%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)
+
 # HID ES400 Solo (Probably Linux 2.4 --Ed.)
 Fingerprint HID EdgePlus Solo ES400 firewall
 Class HID | embedded || firewall
@@ -33152,6 +33630,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 LaserJet 500 MFP M525
+Fingerprint HP LaserJet M525 printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_m525 auto
+SEQ(SP=104-10E%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=B68%W2=B68%W3=B68%W4=B68%W5=B68%W6=B68)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=B68%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=N)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=B68%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=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # HP LaserJet M605
 Fingerprint HP LaserJet M605 printer
 Class HP | embedded || printer
@@ -58838,11 +59334,14 @@ 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)
 
 # Supermicro AOC-SIMSO+. IPMI 2.0 daughter card. Firmware Version: 01.64.00
-Fingerprint Supermicro AOC-SIMSO+ daughter card
+# Epson Artisan 837
+Fingerprint Supermicro AOC-SIMSO+ IPMI card or Epson Artisan 837 printer
 Class Linux | Linux | 2.6.X | remote management
 CPE cpe:/o:linux:linux_kernel:2.6 auto
 Class Supermicro | embedded || remote management
 CPE cpe:/h:supermicro:aoc-simso+
+Class Epson | embedded || printer
+CPE cpe:/h:epson:artisan_837 auto
 SEQ(SP=C1-CB%GCD=1-6%ISR=C7-D1%TI=Z%CI=I|Z%II=I%TS=7)
 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)
@@ -62445,13 +62944,14 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 3.18.14-v7+ #793 SMP PREEMPT Sat May 30 14:04:35 BST 2015 armv7l GNU/Linux (W7)
 # Linux 3.14.46-rt46-ni-3.5.0f0 #1 SMP PREEMPT RT Tue Jan 19 21:49:05 CST 2016 armv7l GNU/Linux
 # Linux 4.4.0-62-generic #83-Ubuntu SMP Wed Jan 18 14:10:15 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux
+# Linux 4.8.15+rt9+ #1 SMP PREEMPT RT Fri Apr 7 20:08:35 CEST 2017 armv7l GNU/Linux
 # 4.10.1-1-ARCH #1 SMP PREEMPT Sun Feb 26 21:08:53 UTC 2017 x86_64 GNU/Linux
-Fingerprint Linux 3.12 - 4.4
+Fingerprint Linux 3.12 - 4.10
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
 Class Linux | Linux | 4.X | general purpose
 CPE cpe:/o:linux:linux_kernel:4 auto
-SEQ(SP=FA-108%GCD=1-6%ISR=FE-112%TI=Z%CI=I%II=I%TS=U)
+SEQ(SP=FA-109%GCD=1-6%ISR=FE-112%TI=Z%CI=I%II=I%TS=U)
 OPS(O1=M5B4NNSNW5|M5B4NNSNW7|M5B4NNSNWA%O2=M5B4NNSNW5|M5B4NNSNW7|M5B4NNSNWA%O3=M5B4NW5|M5B4NW7|M5B4NWA%O4=M5B4NNSNW5|M5B4NNSNW7|M5B4NNSNWA%O5=M5B4NNSNW5|M5B4NNSNW7|M5B4NNSNWA%O6=M5B4NNS)
 WIN(W1=7210%W2=7210%W3=7210%W4=7210%W5=7210%W6=7210)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW5|M5B4NNSNW7|M5B4NNSNWA%CC=Y%Q=)
@@ -63019,10 +63519,11 @@ 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)
 
 # Linux 3.16.7-g319ffe4-dells4048on #1 SMP Sun Jan 22 12:50:00 UTC 2017 x86_64 GNU/Linux
+# Linux 3.16.7-g5c5d2d3-dells3048on #1 SMP Thu Jan 19 12:42:46 UTC 2017 x86_64 GNU/Linux
 Fingerprint Linux 3.16
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3.16 auto
-SEQ(SP=FF-109%GCD=1-6%ISR=102-10C%TI=Z%CI=I%II=I%TS=U)
+SEQ(SP=FF-109%GCD=1-6%ISR=102-112%TI=Z%CI=I%II=I%TS=U)
 OPS(O1=M5B4NNSNW9%O2=M5B4NNSNW9%O3=M5B4NW9%O4=M5B4NNSNW9%O5=M5B4NNSNW9%O6=M5B4NNS)
 WIN(W1=7210%W2=7210%W3=7210%W4=7210%W5=7210%W6=7210)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW9%CC=Y%Q=)
@@ -66384,6 +66885,42 @@ 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)
 
+# Raspbian Jessie, kernel 4.4
+Fingerprint Linux 4.4
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4.4 auto
+SEQ(SP=F9-103%GCD=1-6%ISR=105-10F%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=MAC8ST11NW7%O2=MAC8ST11NW7%O3=MAC8NNT11NW7%O4=MAC8ST11NW7%O5=MAC8ST11NW7%O6=MAC8ST11)
+WIN(W1=6B58%W2=6B58%W3=6B58%W4=6B58%W5=6B58%W6=6B58)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=6BD0%O=MAC8NNSNW7%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)
+
+# Ubuntu 16.04.2 LTS (GNU/Linux 4.4.0-77-generic i686)
+Fingerprint Linux 4.4
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4.4 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=107-111%TI=Z%II=I%TS=8)
+OPS(O1=M578ST11NW7%O2=M578ST11NW7%O3=M578NNT11NW7%O4=M578ST11NW7%O5=M578ST11NW7%O6=M578ST11)
+WIN(W1=7120%W2=7120%W3=7120%W4=7120%W5=7120%W6=7120)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M578NNSNW7%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=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)
+
 # Localhost
 # Linux 4.4.0-47-generic #68-Ubuntu SMP Wed Oct 26 19:39:52 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux / Mint 18 XFCE
 # Linux 4.4.0-62-generic #83-Ubuntu SMP Wed Jan 18 14:09:55 UTC 2017 i686 i686 i686 GNU/Linux
@@ -67272,6 +67809,24 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=800%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)
 
+# ESPEasy OS
+Fingerprint ESPEasy OS (lwIP stack)
+Class lwIP | lwIP || specialized
+CPE cpe:/a:lwip_project:lwip auto
+SEQ(SP=94-9E%GCD=1-6%ISR=9F-A9%TI=I%CI=I%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=16D0%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=16D0%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=16D0%S=A+%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=16D0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=16D0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=7B-85%TG=80%W=16D0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=S)
+
 # Lyngsoe System RFID Reader
 Fingerprint Lyngsoe Systems RFID reader
 Class Lyngsoe | embedded || specialized
@@ -73266,6 +73821,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 Server 2008 R2
+Fingerprint Microsoft Windows Server 2008 R2
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008:r2 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=102-10C%TI=I%CI=I|RD%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)
+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=O%F=AR%RD=0)
+T3(R=N)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=O%A=O%F=R%RD=0)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%RD=0)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=O%A=O%F=R%RD=0)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%RD=0)
+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 R2 Standard 7600
 Fingerprint Microsoft Windows Server 2008 R2 or Windows 8
 Class Microsoft | Windows | 2008 | general purpose
@@ -87169,6 +87742,26 @@ T7(R=Y%DF=N%T=3B-3D%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)
 
+# Nibe F1155-16 Heating Pump
+Fingerprint Nibe F1155 geothermal heat pump (lwIP stack)
+Class Nibe | embedded || specialized
+CPE cpe:/h:nibe:f1155
+Class lwIP | lwIP || general purpose
+CPE cpe:/a:lwip_project:lwip auto
+SEQ(SP=3D-47%GCD=1-6%ISR=87-91%TI=I%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M400%O2=M400%O3=M400%O4=M400%O5=M400%O6=M400)
+WIN(W1=1FA0%W2=1FA0%W3=1FA0%W4=1FA0%W5=1FA0%W6=1FA0)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1FA0%O=M400%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=Y%DF=N%T=FA-104%TG=FF%W=1FA0%S=O%A=S+%F=AS%O=M400%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=1FA0%S=A+%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=1FA0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=1FA0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=1FA0%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)
+
 # Nintendo 3DS System Software v10.7.0-32E
 Fingerprint Nintendo 3DS
 Class Nintendo | embedded || game console
@@ -88282,6 +88875,25 @@ T7(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S%F=ARF%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=1B-25%TG=20%CD=S)
 
+# FreeRTOS and lwip (filtered from binary)
+Fingerprint Ocean Signal E101V emergency beacon (FreeRTOS/lwIP)
+Class Ocean Signal | embedded || specialized
+Class lwIP | lwIP || general purpose
+CPE cpe:/a:lwip_project:lwip auto
+SEQ(SP=F-19%GCD=1-6%ISR=10-1A%TI=I|RD%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=B68%W2=B68%W3=B68%W4=B68%W5=B68%W6=B68)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=B68%O=M5B4%CC=N)
+T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0)
+T2(R=N)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=O%A=S+%F=AS%O=M5B4%RD=0)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S%F=AR%RD=0)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S+%F=AR%RD=0)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S%F=AR%RD=0)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S+%F=AR%RD=0)
+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)
+
 # Oki Model number B4545
 Fingerprint Oki B4545 printer
 Class Oki | embedded || printer
@@ -89303,11 +89915,12 @@ 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=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)
 
-# OpenBSD  4.3 GENERIC.MP#587 i386
+# OpenBSD 4.3 GENERIC.MP#587 i386
+# OpenBSD 4.3 GENERIC#698 i386
 Fingerprint OpenBSD 4.3
 Class OpenBSD | OpenBSD | 4.X | general purpose
 CPE cpe:/o:openbsd:openbsd:4.3
-SEQ(SP=FC-106%GCD=1-6%ISR=104-10E%TI=RD%CI=RD%II=RI%TS=22)
+SEQ(SP=FC-106%GCD=1-6%ISR=104-10E%TI=RD%CI=RD%II=RI%TS=21|22)
 OPS(O1=M5B4NNSNW0NNT11%O2=M5B4NNSNW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NNSNW0NNT11%O5=M5B4NNSNW0NNT11%O6=M5B4NNSNNT11)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M5B4NNSNW0%CC=N%Q=)
@@ -89884,6 +90497,24 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=I%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# OpenBSD 5.3 GENERIC#50 i386
+Fingerprint OpenBSD 5.3
+Class OpenBSD | OpenBSD | 5.X | general purpose
+CPE cpe:/o:openbsd:openbsd:5.3 auto
+SEQ(SP=FE-108%GCD=2|4|6|8|A%ISR=108-112%TI=RD%CI=RI%II=RI%TS=21)
+OPS(O1=M5B4NNSNW3NNT11%O2=M5B4NNSNW3NNT11%O3=M5B4NW3NNT11%O4=M5B4NNSNW3NNT11%O5=M5B4NNSNW3NNT11%O6=M5B4NNSNNT11)
+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=M5B4NNSNW3%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=Y%T=3B-45%TG=40%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+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)
+
 # localhost scan
 # OpenBSD 5.4 GENERIC#37 i386
 Fingerprint OpenBSD 5.4
@@ -90122,24 +90753,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=D8D0%RIPCK=I%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# OpenBSD 6.0 GENERIC#0 i386
-Fingerprint OpenBSD 6.0
-Class OpenBSD | OpenBSD | 6.X | general purpose
-CPE cpe:/o:openbsd:openbsd:6.0 auto
-SEQ(SP=101-10B%GCD=1-6%ISR=102-10C%TI=RD%CI=RI%II=RI%TS=21)
-OPS(O1=M5B4NNSNW6NNT11%O2=M5B4NNSNW6NNT11%O3=M5B4NW6NNT11%O4=M5B4NNSNW6NNT11%O5=M5B4NNSNW6NNT11%O6=M5B4NNSNNT11)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M5B4NNSNW6%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=S%F=AR%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=S%F=AR%O=%RD=0%Q=)
-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=S%T=FA-104%TG=FF%CD=S)
-
 # OpenBSD 6.0 GENERIC#2148 amd64
 Fingerprint OpenBSD 6.0
 Class OpenBSD | OpenBSD | 6.X | general purpose
@@ -90158,6 +90771,81 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=53C2%RIPCK=I%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# OpenBSD 6.0 GENERIC#0 i386
+# OpenBSD 6.1 GENERIC.MP#20 amd64
+# OpenBSD 6.1 GENERIC.MP#81 sparc64
+# OpenBSD 6.1 GENERIC.MP#20 amd64
+Fingerprint OpenBSD 6.0 - 6.1
+Class OpenBSD | OpenBSD | 6.X | general purpose
+CPE cpe:/o:openbsd:openbsd:6 auto
+SEQ(SP=F7-10B%GCD=1-6%ISR=102-10E%TI=RD%CI=RI%II=RI%TS=21|22)
+OPS(O1=M5B4NNSNW6NNT11%O2=M5B4NNSNW6NNT11%O3=M5B4NW6NNT11%O4=M5B4NNSNW6NNT11%O5=M5B4NNSNW6NNT11%O6=M5B4NNSNNT11)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M5B4NNSNW6%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=S%F=AR%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=S%F=AR%O=%RD=0%Q=)
+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=S%T=FA-104%TG=FF%CD=S)
+
+# OpenBSD 6.1 GENERIC.MP#37 amd64
+Fingerprint OpenBSD 6.1
+Class OpenBSD | OpenBSD | 6.X | general purpose
+CPE cpe:/o:openbsd:openbsd:6.1 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=105-10F%TI=RD%CI=RI%II=RI%TS=22)
+OPS(O1=M562NNSNW6NNT11%O2=M562NNSNW6NNT11%O3=M562NW6NNT11%O4=M562NNSNW6NNT11%O5=M562NNSNW6NNT11%O6=M562NNSNNT11)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M562NNSNW6%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=S%F=AR%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=S%F=AR%O=%RD=0%Q=)
+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=S%T=FA-104%TG=FF%CD=S)
+
+# OpenBSD 6.1 GENERIC.MP#20 amd64
+Fingerprint OpenBSD 6.1
+Class OpenBSD | OpenBSD | 6.X | general purpose
+CPE cpe:/o:openbsd:openbsd:6.1 auto
+SEQ(SP=F7-101%GCD=1-6%ISR=FD-115%TI=RD%CI=RI%II=RI%TS=20|21)
+OPS(O1=M5B4NNSNW6NNT11%O2=M5B4NNSNW6NNT11%O3=M5B4NW6NNT11%O4=M5B4NNSNW6NNT11%O5=M5B4NNSNW6NNT11%O6=M5B4NNSNNT11)
+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=M5B4NNSNW6%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=Y%T=3B-45%TG=40%W=0%S=A%A=S%F=AR%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=Y%T=3B-45%TG=40%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+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)
+
+# OpenBSD 6.1 GENERIC.MP#20 amd64
+Fingerprint OpenBSD 6.1
+Class OpenBSD | OpenBSD | 6.X | general purpose
+CPE cpe:/o:openbsd:openbsd:6.1 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=106-110%TI=RD%CI=RI%II=RI%TS=22)
+OPS(O1=M5B4NNSNW6NNT11%O2=M5B4NNSNW6NNT11%O3=M5B4NW6NNT11%O4=M5B4NNSNW6NNT11%O5=M5B4NNSNW6NNT11%O6=M5B4NNSNNT11)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M5B4NNSNW6%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=S%F=AR%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=S%F=AR%O=%RD=0%Q=)
+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)
+
 # SNAP PAC Ethernet Brain 2
 Fingerprint Opto 22 SNAP-PAC-EB2 I/O controller
 Class Opto 22 | embedded || specialized
@@ -90439,8 +91127,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)
 
 # OSRAM Lightify Controller firmware version 1.1.1.24
-Fingerprint OSRAM Lightify lighting controller
+Fingerprint OSRAM Lightify ZigBee gateway
 Class OSRAM | embedded || specialized
+CPE cpe:/h:osram:lightify
 SEQ(SP=0-5%GCD=154|2A8|3FC|550|6A4%ISR=59-63%TI=I%CI=I%II=RI%SS=O%TS=U)
 OPS(O1=M578%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
 WIN(W1=41A0%W2=41A0%W3=41A0%W4=41A0%W5=41A0%W6=41A0)
@@ -90473,6 +91162,24 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=41A0%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)
 
+# OSRAM Lightify ZigBee gateway version 1.1.3.41
+Fingerprint OSRAM Lightify ZigBee gateway
+Class OSRAM | embedded || specialized
+CPE cpe:/h:osram:lightify
+SEQ(SP=E-18%GCD=1-6%ISR=29-33%TI=I%CI=I%II=RI%SS=S%TS=U)
+OPS(O1=M578%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
+WIN(W1=41A0%W2=41A0%W3=41A0%W4=41A0%W5=41A0%W6=41A0)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=41A0%O=M578%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=Y%DF=N%T=FA-104%TG=FF%W=41A0%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=41A0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=41A0%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=41A0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=41A0%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)
+
 # OUYA game console
 Fingerprint OUYA game console
 Class Ouya | embedded || game console
@@ -99131,6 +99838,25 @@ T7(R=Y%DF=N%T=3B-3D%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=S%T=FA-104%TG=FF%CD=S)
 
+# SunPower spr-pmr-gtwy
+Fingerprint SunPower solar monitoring device (uIP stack)
+Class SunPower | embedded || power-misc
+Class RISE SICS | uIP || specialized
+CPE cpe:/a:rise_sics:uip
+SEQ(SP=0-5%GCD=0%ISR=0-5%TI=I%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M5BA%O2=M5BA%O3=M5BA%O4=M5BA%O5=M5BA%O6=M5BA)
+WIN(W1=5BA%W2=5BA%W3=5BA%W4=5BA%W5=5BA%W6=5BA)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=5BA%O=M5BA%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=80%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=A%A=S+%F=AR%O=%RD=0%Q=)
+U1(R=N)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # Dedicated SuperMicro lights out management based on IPMI including remote KVM for a 1u ivy bridge Intel Xeon system.
 Fingerprint Supermicro IPMI remote management
 Class Supermicro | embedded || remote management
@@ -100394,6 +101120,23 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%S=A%A=O%F=R%O=%RD=0%Q=)
 U1(R=N)
 IE(R=N)
 
+# Tigo Energy Cloud Connect (Looks like Linux --ed.)
+Fingerprint Tigo Energy Cloud Connect solar power gateway
+Class Tigo Energy | embedded || power-misc
+SEQ(SP=FC-106%GCD=1-6%ISR=105-10F%TI=Z%CI=I%TS=7)
+OPS(O1=M4D8ST11NW5%O2=M4D8ST11NW5%O3=M4D8NNT11NW5%O4=M4D8ST11NW5%O5=M4D8ST11NW5%O6=M4D8ST11)
+WIN(W1=5FF0%W2=5FF0%W3=5FF0%W4=5FF0%W5=5FF0%W6=5FF0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=60E0%O=M4D8NNSNW5%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)
+
 # Topfield TF6000PVR ES (Satellite based digital video recorder)
 # Topfield TF600PVRc
 # Topfield TF600PVR