diff --git a/nmap-os-db b/nmap-os-db
index a365f38a3..ba684b81e 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -4594,8 +4594,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 Fingerprint Apple iPhone mobile phone (iPhone OS 3.0 - iOS 4.2.1)
 Class Apple | iPhone OS | 3.X | phone
 CPE cpe:/o:apple:iphone_os:3 auto
-Class Apple | iOS | 3.X | phone
-CPE cpe:/o:apple:iphone_os:3 auto
+Class Apple | iOS | 4.X | phone
+CPE cpe:/o:apple:iphone_os:4
 SEQ(SP=ED-10B%GCD=1-6%ISR=F6-10A%TI=RD%CI=RD|RI%II=RI%TS=3)
 OPS(O1=M582NW2NNT11SLL%O2=M582NW2NNT11SLL%O3=M582NW2NNT11%O4=M582NW2NNT11SLL%O5=M582NW2NNT11SLL%O6=M582NNT11SLL)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -21460,6 +21460,24 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=S)
 
+# Denver AC-5000W MK2, NDK Release Version: 00.14.00 (lwIP?)
+Fingerprint Denver Electronics AC-5000W MK2 camera
+Class Denver Electronics | embedded || webcam
+CPE cpe:/h:denver_electronics:ac-5000w
+SEQ(CI=I%II=RI%TS=U)
+OPS(R=N)
+WIN(R=N)
+ECN(R=N)
+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=E420%S=A+%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=E420%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=E420%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=E420%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)
+
 # Develop Ineo 350. Develop is a Konica Minolta reseller with it's own brands / marketing names. (The 250 and 350 builds seem to be identical.)
 Fingerprint Develop ineo 250 or 350 printer
 Class Develop | embedded || printer
@@ -28620,7 +28638,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 Fingerprint Android 5.1
 Class Google | Android | 5.X | phone
 CPE cpe:/o:google:android:5.1 auto
-SEQ(SP=FD-107%GCD=1-6%ISR=104-10E%TI=Z%CI=I%II=I%TS=8)
+SEQ(SP=FD-107%GCD=1-6%ISR=100-10E%TI=Z%CI=I%II=I%TS=8)
 OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%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=M5B4NNSNW6%CC=Y%Q=)
@@ -34266,6 +34284,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=S)
 
+# 4960 OS
+Fingerprint IBM 4960 OS point-of-sale system
+Class IBM | 4960 OS || specialized
+CPE cpe:/o:ibm:4960_operating_system
+SEQ(SP=C-16%GCD=600|C00|1200|1800|1E00%ISR=6C-76%TI=I%CI=Z%II=I%SS=S%TS=U)
+OPS(O1=%O2=%O3=%O4=%O5=%O6=)
+WIN(W1=7000%W2=7000%W3=7000%W4=7000%W5=7000%W6=7000)
+ECN(R=Y%DF=N%T=19-23%TG=20%W=7000%O=%CC=N%Q=)
+T1(R=Y%DF=N%T=19-23%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=19-23%TG=20%W=7000%S=O%A=O%F=A%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=19-23%TG=20%W=7000%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=S%T=FA-104%TG=FF%CD=S)
+
 # AIX Version 4.2
 Fingerprint IBM AIX 4.2
 Class IBM | AIX | 4.X | general purpose
@@ -35446,24 +35482,6 @@ T7(R=Y%DF=Y%T=BE-C8%TG=FF%W=0%S=Z%A=S+%F=AR%RD=0)
 U1(DF=N%T=BE-C8%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=BE-C8%TG=FF%CD=S)
 
-# 4960 OS
-Fingerprint IBM 4960 OS point-of-sale system
-Class IBM | embedded || specialized
-CPE cpe:/o:ibm:4960_operating_system
-SEQ(SP=C-16%GCD=600|C00|1200|1800|1E00%ISR=6C-76%TI=I%CI=Z%II=I%SS=S%TS=U)
-OPS(O1=%O2=%O3=%O4=%O5=%O6=)
-WIN(W1=7000%W2=7000%W3=7000%W4=7000%W5=7000%W6=7000)
-ECN(R=Y%DF=N%T=19-23%TG=20%W=7000%O=%CC=N%Q=)
-T1(R=Y%DF=N%T=19-23%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=19-23%TG=20%W=7000%S=O%A=O%F=A%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=19-23%TG=20%W=7000%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=S%T=FA-104%TG=FF%CD=S)
-
 # Model 204, needs c3270 program to access on port 23
 # I don't know if this constitutes an OS on its own, but there are no other close matches. --Ed.
 Fingerprint IBM Model 204 DBMS
@@ -51350,10 +51368,12 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 2.6.32-5-amd64 #1 SMP Sun May 6 04:00:17 UTC 2012 x86_64 GNU/Linux / Debian 6.0 Squeeze
 # Linux 2.6.32-51-generic-pae #113-Ubuntu SMP Wed Aug 21 20:02:16 UTC 2013 i686 GNU/Linux
 # Linux 2.6.32.60 #4 SMP Wed Dec 18 12:27:25 CET 2013 mips GNU/Linux
+# Riverbed Steelhead running RiOS 9.1.0a (Looks like Linux 2.6.32 -- Ed.)
+# Ubiquiti AirOS 7.1.4 (Linux 2.6.32.65)
 Fingerprint Linux 2.6.32
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6.32 auto
-SEQ(SP=FC-10A%GCD=1-6%ISR=FD-111%TI=Z%CI=Z%II=I%TS=7|8)
+SEQ(SP=FC-10A%GCD=1-6%ISR=FD-111%TI=Z%CI=Z%II=I%TS=7|8|A)
 OPS(O1=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8|M5B4ST11NW9%O2=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8|M5B4ST11NW9%O3=M5B4NNT11NW1|M5B4NNT11NW2|M5B4NNT11NW3|M5B4NNT11NW4|M5B4NNT11NW5|M5B4NNT11NW6|M5B4NNT11NW7|M5B4NNT11NW8|M5B4NNT11NW9%O4=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8|M5B4ST11NW9%O5=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8|M5B4ST11NW9%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|M5B4NNSNW2|M5B4NNSNW3|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW8|M5B4NNSNW9%CC=Y%Q=)
@@ -53170,6 +53190,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(R=N)
 
+# Seagate NAS: Linux 2.6.35.13-cavm1.whitney-econa.whitney-econa #2 Thu Jul 18 14:51:22 PDT 2013 armv6l GNU/Linux
+Fingerprint Linux 2.6.35
+Class Linux | Linux | 2.6.X | general purpose
+CPE cpe:/o:linux:linux_kernel:2.6.35 auto
+SEQ(SP=CA-D4%GCD=1-6%ISR=C8-D2%TI=Z%CI=Z%II=I%TS=U)
+OPS(O1=M5B4NNSNW5%O2=M5B4NNSNW5%O3=M5B4NW5%O4=M5B4NNSNW5%O5=M5B4NNSNW5%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=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=Y%DF=Y%T=3B-45%TG=40%W=16D0%S=O%A=S+%F=AS%O=M5B4NNSNW5%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)
+
 # Linux 2.6.36-stable+ #16 SMP Sun Nov 7 11:40:54 EET 2010 x86_64 x86_64 x86_64 GNU/Linux
 Fingerprint Linux 2.6.36
 Class Linux | Linux | 2.6.X | general purpose
@@ -60789,10 +60827,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux localhost 3.10.0-123.20.1.el7.x86_64 #1 SMP Thu Jan 29 18:05:33 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux
 # Linux 3.10.0-123.8.1.el7.x86_64 #1 SMP Mon Sep 22 19:06:58 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
 # Linux 3.10.0-123.13.1.el7.x86_64 #1 SMP Tue Dec 9 23:06:09 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
+# DSM 5.2-5644 Update (Linux 3.10)
 Fingerprint Linux 3.4 - 3.10
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
-SEQ(SP=FE-10A%GCD=1-6%ISR=101-111%TI=Z%CI=I%II=I%TS=A)
+SEQ(SP=FC-10A%GCD=1-6%ISR=101-111%TI=Z%CI=I%II=I%TS=A)
 OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%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=M5B4NNSNW7%CC=Y%Q=)
@@ -61482,6 +61521,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)
 
+# Oracle Linux 6.6 (kernel 3.8.13 --ed.)
+Fingerprint Linux 3.8
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3.8 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=107-111%TI=Z%CI=I%II=I%TS=A)
+OPS(O1=M2301ST11NW7%O2=M2301ST11NW7%O3=M2301NNT11NW7%O4=M2301ST11NW7%O5=M2301ST11NW7%O6=M2301ST11)
+WIN(W1=45EA%W2=45EA%W3=45EA%W4=45EA%W5=45EA%W6=45EA)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4602%O=M2301NNSNW7%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)
+
 # Linux 3.8.0-19-generic #30-Ubuntu SMP Wed May 1 16:36:13 UTC 2013 i686 i686 i686 GNU/Linux / Ubuntu 13.04 (Xubuntu)
 # Linux 3.13.0-35-generic #62-Ubuntu SMP Fri Aug 15 01:58:42 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux
 # Linux 3.13.0-43-generic #72-Ubuntu SMP Mon Dec 8 19:35:06 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux (Ubuntu 14.04.1 LTS)
@@ -62078,7 +62135,7 @@ Class Linux | Linux | 3.X | WAP
 CPE cpe:/o:linux:linux_kernel:3.18
 Class Linux | Linux | 4.X | WAP
 CPE cpe:/o:linux:linux_kernel:4.1 auto
-SEQ(SP=F8-10A%GCD=1-6%ISR=100-112%TI=Z%CI=I|Z|RD%II=I%TS=7|8)
+SEQ(SP=F8-10A%GCD=1-6%ISR=FC-112%TI=Z%CI=I|Z|RD%II=I%TS=7|8)
 OPS(O1=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5%O2=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5%O3=M5B4NNT11NW2|M5B4NNT11NW3|M5B4NNT11NW4|M5B4NNT11NW5%O4=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5%O5=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5%O6=M5B4ST11)
 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=M5B4NNSNW2|M5B4NNSNW3|M5B4NNSNW4|M5B4NNSNW5%CC=N%Q=)
@@ -62092,6 +62149,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)
 
+# DD-WRT v3.0-r29114 mini (02/17/16), Linux 4.4.2-rc1 #319 Wed Feb 17 08:40:45 CET 2016 armv7l
+Fingerprint DD-WRT v3.0 (Linux 4.4.2)
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4.4.2 auto
+SEQ(SP=FC-106%GCD=1-6%ISR=104-10E%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M5B4ST11NW3%O2=M5B4ST11NW3%O3=M5B4NNT11NW3%O4=M5B4ST11NW3%O5=M5B4ST11NW3%O6=M5B4ST11)
+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=M5B4NNSNW3%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)
+
 # Linux 4.0.5-gentoo #7 SMP Fri Aug 14 12:12:12 PDT 2015 x86_64 Intel(R) Xeon(R) CPU E5-1620 v3 @ 3.50GHz GenuineIntel GNU/Linux
 Fingerprint Linux 4.0
 Class Linux | Linux | 4.X | general purpose
@@ -63392,7 +63467,7 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows 10
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=101-10B%GCD=1-6%ISR=100-111%TI=I%CI=I|RD%II=I%SS=S%TS=A)
+SEQ(SP=F8-10B%GCD=1-6%ISR=100-111%TI=I%CI=I|RD%II=I%SS=S%TS=A)
 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=)
@@ -63411,10 +63486,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=Z)
 # Windows 10.0 (build 10074) on QEMU
 # Version 10.0 (build 10240)
 # Version 1511 (OS Build) 10586.36)
+# Version 10.0 (Build 10240) (CI=RD)
 Fingerprint Microsoft Windows 10 build 10074 - 10586
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=F7-10D%GCD=1-6%ISR=FB-113%TI=I%CI=I%II=I%SS=S%TS=A)
+SEQ(SP=F7-10D%GCD=1-6%ISR=FB-113%TI=I%CI=I|RD%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
@@ -63465,10 +63541,11 @@ 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 10 Enterprise
-Fingerprint Microsoft Windows 10 Enterprise
+# Version 1511
+Fingerprint Microsoft Windows 10 build 10586
 Class Microsoft | Windows | 10 | specialized
 CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=FD-107%GCD=2|4|6|8|A%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=A)
+SEQ(SP=FD-107%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
@@ -66750,10 +66827,11 @@ U1(DF=N%T=7B-85%TG=80%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
 # Version 5.2 (Build 3790.svr03_sp2_gdr.080813-1204: Service Pack 2)
+# # Version 5.2 R2 (Build 3790.srv03_sp2_qfe.100216-1301 : Service Pack 2)
 Fingerprint Microsoft Windows Server 2003 SP2
 Class Microsoft | Windows | 2003 | general purpose
 CPE cpe:/o:microsoft:windows_server_2003::sp2
-SEQ(SP=101-10B%GCD=1-6%ISR=102-10C%TI=I%II=I%SS=S%TS=0)
+SEQ(SP=F7-10B%GCD=1-6%ISR=F8-10C%TI=I%CI=I%II=I%SS=S%TS=0)
 OPS(O1=M2300NW0NNT00NNS%O2=M2300NW0NNT00NNS%O3=M2300NW0NNT00%O4=M2300NW0NNT00NNS%O5=M2300NW0NNT00NNS%O6=M2300NNT00NNS)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=N%T=7B-85%TG=80%W=4000%O=M2300NW0NNS%CC=N%Q=)
@@ -68200,6 +68278,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(R=N)
 
+# Windows 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=101-10B%GCD=1-6%ISR=107-111%TI=I%TS=7)
+OPS(O1=M56ANW8ST11%O2=M56ANW8ST11%O3=M56ANW8NNT11%O4=M56ANW8ST11%O5=M56ANW8ST11%O6=M56AST11)
+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=M56ANW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # Windows Server 2008 R2 Standard 7600
 Fingerprint Microsoft Windows Server 2008 R2 or Windows 8
 Class Microsoft | Windows | 2008 | general purpose
@@ -68698,6 +68794,42 @@ 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)
 
+# Microsoft Windows Server Version 6.0 Build 6002 SP2
+Fingerprint Microsoft Windows Server 2008 SP2
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008::sp2 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=10A-114%TI=RD%II=RI%TS=7)
+OPS(O1=M558NW8ST11%O2=M558NW8ST11%O3=M558NW8NNT11%O4=M558NW8ST11%O5=M558NW8ST11%O6=M558ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=2000%O=M558NW8NNS%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=N)
+T4(R=N)
+T5(R=Y%DF=N%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=164%UN=0%RIPL=G%RID=7D9B%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Windows Server 2008 Datacenter Version 6.0 build 6002: Service Pack 2
+Fingerprint Microsoft Windows Server 2008 SP2 Datacenter Version
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008::sp2 auto
+SEQ(SP=104-10E%GCD=1-6%ISR=104-10E%TI=I%CI=I%TS=7)
+OPS(O1=M2301NW8ST11%O2=M2301NW8ST11%O3=M2301NW8NNT11%O4=M2301NW8ST11%O5=M2301NW8ST11%O6=M2301ST11)
+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=M2301NW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # 6.0.6002 Service Pack 2 Build 6002
 # Xbox One 6.2.12825.0 (xb_rel_1505.150507-2219) fre
 # Windows 10 Enterprise
@@ -68776,24 +68908,6 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# 6.2.9200
-Fingerprint Microsoft Windows Server 2012
-Class Microsoft | Windows | 2012 | general purpose
-CPE cpe:/o:microsoft:windows_server_2012 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=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=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%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=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 2012 Standard 64 bit
 Fingerprint Microsoft Windows Server 2012
 Class Microsoft | Windows | 2012 | general purpose
@@ -68849,10 +68963,11 @@ U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # 6.3
+# Windows Storage Server 2012 Version 6.2 (build 9200)
 Fingerprint Microsoft Windows Server 2012
 Class Microsoft | Windows | 2012 | general purpose
 CPE cpe:/o:microsoft:windows_server_2012 auto
-SEQ(SP=103-10D%GCD=1-6%ISR=108-112%TI=RD|RI%CI=RD|RI%II=RI%SS=S%TS=7)
+SEQ(SP=FA-10D%GCD=1-6%ISR=108-112%TI=RD|RI%CI=RD|RI%II=RI%SS=S%TS=7)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
@@ -68884,6 +68999,42 @@ 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)
 
+# Microsoft Windows Server Version 6.2 (Build 9200)
+Fingerprint Microsoft Windows Server 2012
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M550NW8ST11%O2=M550NW8ST11%O3=M550NW8NNT11%O4=M550NW8ST11%O5=M550NW8ST11%O6=M550ST11)
+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=M550NW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Data Center
+Fingerprint Microsoft Windows Server 2012 Data Center
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=FE-108%TI=I%CI=I%TS=7)
+OPS(O1=M4ECNW8ST11%O2=M4ECNW8ST11%O3=M4ECNW8NNT11%O4=M4ECNW8ST11%O5=M4ECNW8ST11%O6=M4ECST11)
+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=M4ECNW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # Windows 6.2 (Build 9200)
 # Version 6.3 (Build 9600) - Windows Server 2012 R2 Standard Evaluation
 Fingerprint Microsoft Windows Server 2012 or Server 2012 R2
@@ -68904,6 +69055,26 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# 6.2.9200
+# Windows Server 2012 R2
+# 6.3.9600
+Fingerprint Microsoft Windows Server 2012 or Windows Server 2012 R2
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012:r2 auto
+SEQ(SP=FA-10A%GCD=1-6%ISR=F8-110%TI=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=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%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=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 2012 R2 Datacenter Edition on Windows Azure
 Fingerprint Microsoft Windows Server 2012 R2
 Class Microsoft | Windows | 2012 | general purpose
@@ -69052,7 +69223,7 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows Server 2012 R2 Update 1
 Class Microsoft | Windows | 2012 | general purpose
 CPE cpe:/o:microsoft:windows_server_2012:r2
-SEQ(SP=FA-104%GCD=1-6%ISR=10B-115%TI=I%CI=I%II=I%SS=O%TS=7)
+SEQ(SP=FA-106%GCD=1-6%ISR=101-115%TI=I%CI=I%II=I%SS=O|S%TS=7)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
@@ -69102,10 +69273,28 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Microsoft Windows Server Version 1511 (OS Build 10586.0)
+Fingerprint Microsoft Windows Server 2016 build 10586
+Class Microsoft | Windows | 2016 | general purpose
+CPE cpe:/o:microsoft:windows_server_2016 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
+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=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Windows 3.1 with Trumpet WinSock 3.0D running in DOSBox 0.73 MB5
 Fingerprint Microsoft Windows 3.1 with Trumpet WinSock
 Class Microsoft | Windows | 3.X | general purpose
-CPE cpe:/o:microsoft:windows auto
+CPE cpe:/o:microsoft:windows:3.1 auto
 SEQ(SP=2D-45%GCD=10000|20000|30000|40000|50000%ISR=CB-D5%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=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
@@ -69121,9 +69310,9 @@ U1(DF=N%T=3B-3D%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-3D%TG=40%CD=S)
 
 # Windows for Workgroups version 3.11
-Fingerprint Microsoft Windows for Workgroups 3.11
+Fingerprint Microsoft Windows 3.11 for Workgroups
 Class Microsoft | Windows | 3.X | general purpose
-CPE cpe:/o:microsoft:windows auto
+CPE cpe:/o:microsoft:windows:3.11 auto
 SEQ(SP=F-2D%GCD=1-6%ISR=4B-55%TI=BI|RI%II=BI%SS=O|S%TS=U)
 OPS(O1=|M5B4%O2=|M5B4%O3=|M5B4%O4=|M5B4%O5=%O6=)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=0%W6=0)
@@ -69139,9 +69328,9 @@ U1(DF=N%T=1B-25%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=1B-25%TG=20%CD=Z)
 
 # MS-DOS 6.22 plus Windows for Workgroups 3.11 + Microsoft TCP/IP 3.11b
-Fingerprint Microsoft Windows for Workgroups 3.11
+Fingerprint Microsoft Windows 3.11 for Workgroups
 Class Microsoft | Windows | 3.X | general purpose
-CPE cpe:/o:microsoft:windows auto
+CPE cpe:/o:microsoft:windows:3.11 auto
 SEQ(SP=0-5%GCD=64|C8|12C|190|1F4%ISR=4B-55%TI=BI%CI=BI%II=BI%SS=O%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=%O6=)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=0%W6=0)
@@ -69156,13 +69345,31 @@ 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=S%T=1B-25%TG=20%CD=Z)
 
+# Windows for Workgroups Version 3.11
+Fingerprint Microsoft Windows 3.11 for Workgroups
+Class Microsoft | Windows | 3.X | general purpose
+CPE cpe:/o:microsoft:windows:3.11 auto
+SEQ(SP=0-5%GCD=65|CA|12F|194|1F9%ISR=4B-55%TI=BI|RD%CI=BI%II=BI%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=)
+WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=0)
+ECN(R=Y%DF=N%T=1B-25%TG=20%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=Y%T=1B-25%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=1B-25%TG=20%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=1B-25%TG=20%W=0%S=A%A=S+%F=R%O=%RD=0%Q=)
+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=S%T=1B-25%TG=20%CD=Z)
+
 # Windows for Workgroups Version 3.11, Finnish version
 # Windows NT Version 3.51
-Fingerprint Microsoft Windows for Workgroups 3.11 or Windows NT 3.51
+Fingerprint Microsoft Windows 3.11 for Workgroups or Windows NT 3.51
 Class Microsoft | Windows | 3.X | general purpose
-CPE cpe:/o:microsoft:windows auto
+CPE cpe:/o:microsoft:windows:3.11 auto
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:3.51 auto
 SEQ(SP=27-35%GCD=1-6%ISR=4B-55%TI=BI%CI=BI%II=BI%SS=O%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=%O6=)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=0%W6=0)
@@ -69182,11 +69389,11 @@ IE(DFI=S%T=1D-27%TG=20%CD=Z)
 # Windows for Workgroups 3.11, using Microsoft TCP/IP-32 3.11b.
 # Windows NT 3.51 Build 1057, no service pack
 # Windows NT 3.51 build 1057 SP5
-Fingerprint Microsoft Windows for Workgroups 3.11, Windows NT 3.51 SP0 - SP5, or Windows 95
+Fingerprint Microsoft Windows 3.11 for Workgroups, Windows NT 3.51 SP0 - SP5, or Windows 95
 Class Microsoft | Windows | 3.X | general purpose
-CPE cpe:/o:microsoft:windows auto
+CPE cpe:/o:microsoft:windows:3.11 auto
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:3.51 auto
 Class Microsoft | Windows | 95 | general purpose
 CPE cpe:/o:microsoft:windows_95 auto
 SEQ(SP=0-DF%GCD=1-6|68|D0|138|1A0|208%ISR=4B-89%TI=BI%II=BI%SS=S%TS=U)
@@ -69980,10 +70187,11 @@ 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)
 
 # Microsoft Windows 7 Ultimate  6.1.7601 Service Pack 1 Build 7601
+# Microsoft Windows Version 6.1 (numéro 7601: Service Pack 1)
 Fingerprint Microsoft Windows 7 SP1
 Class Microsoft | Windows | 7 | general purpose
 CPE cpe:/o:microsoft:windows_7::sp1 auto
-SEQ(SP=FB-105%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=7)
+SEQ(SP=FB-109%GCD=1-6%ISR=106-110%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=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
@@ -70285,29 +70493,11 @@ 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=Z)
 
-# Version 6.1 Build 7601: SP1
-Fingerprint Microsoft Windows 7 SP1
-Class Microsoft | Windows | 7 | general purpose
-CPE cpe:/o:microsoft:windows_7::sp1 auto
-SEQ(SP=F6-100%GCD=1-6%ISR=106-110%TI=I%CI=I%TS=7)
-OPS(O1=M538NW8ST11%O2=M538NW8ST11%O3=M538NW8NNT11%O4=M538NW8ST11%O5=M538NW8ST11%O6=M538ST11)
-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=M538NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(R=N)
-
 # Windows 7 Enterprise Version 6.1 (Build 7601: Service Pack 1)
 Fingerprint Microsoft Windows 7 SP1
 Class Microsoft | Windows | 7 | general purpose
 CPE cpe:/o:microsoft:windows_7::sp1 auto
-SEQ(SP=ED-F7%GCD=1-6%ISR=FE-108%TI=I%CI=I%II=I%SS=S%TS=7)
+SEQ(SP=ED-107%GCD=1-6%ISR=FE-10E%TI=I%CI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NW2ST11%O2=M5B4NW2ST11%O3=M5B4NW2NNT11%O4=M5B4NW2ST11%O5=M5B4NW2ST11%O6=M5B4ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M5B4NW2NNS%CC=N%Q=)
@@ -70357,6 +70547,44 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Windows 7 Enterprise 6.1 (build 760: Service Pack 1)
+Fingerprint Microsoft Windows 7 SP1
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7::sp1 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=101-10B%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4ST11%O2=M5B4ST11%O3=M5B4NNT11%O4=M5B4ST11%O5=M5B4ST11%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=M5B4NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
+# Version 6.1 Build 7601: SP1
+Fingerprint Microsoft Windows 7 SP1 or Windows Server 2008
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7 auto
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008 auto
+SEQ(SP=F6-112%GCD=1-6%ISR=106-110%TI=I%CI=I%TS=7)
+OPS(O1=M538NW8ST11%O2=M538NW8ST11%O3=M538NW8NNT11%O4=M538NW8ST11%O5=M538NW8ST11%O6=M538ST11)
+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=M538NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # version 7 compilation 7601 service pack 1
 # Microsoft Windows Web Server 2008 R2
 Fingerprint Microsoft Windows 7 SP1 or Windows Server 2008 R2
@@ -70819,6 +71047,43 @@ 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)
 
+# Version 6.3 (Build 9600)
+Fingerprint Microsoft Windows 8.1 R1
+Class Microsoft | Windows | 8.1 | general purpose
+CPE cpe:/o:microsoft:windows_8.1:r1 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=109-113%TI=I%TS=7)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
+# Localhost with Npcap
+# 6.3.9600
+Fingerprint Microsoft Windows 8.1 R1
+Class Microsoft | Windows | 8.1 | general purpose
+CPE cpe:/o:microsoft:windows_8.1:r1 auto
+SEQ(SP=F9-107%GCD=1-6%ISR=102-10E%TI=I%CI=I%II=I%TS=7)
+OPS(O1=MFFD7NW8ST11%O2=MFFD7NW8ST11%O3=MFFD7NW8NNT11%O4=MFFD7NW8ST11%O5=MFFD7NW8ST11%O6=MFFD7ST11)
+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=MFFD7NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%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
@@ -71478,7 +71743,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Windows NT 3.1 running in VMWare.
 Fingerprint Microsoft Windows NT 3.1
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:3.1 auto
 SEQ(SP=24-2E%GCD=8|10|18|20|28%ISR=30-3A%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=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -71514,7 +71779,7 @@ IE(DFI=S%T=1B-25%TG=20%CD=Z)
 # Microsoft (R) Windows NT (R) Version 4.0 (Build 1381)
 Fingerprint Microsoft Windows NT 4.0
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:4.0 auto
 SEQ(SP=B-3D%GCD=1-6%ISR=4B-55%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71532,7 +71797,7 @@ IE(DFI=S%T=7C-86%TG=80%CD=Z)
 # Microsoft Windows NT 4.0 build 1381, no service pack, fresh install, running in virtualbox on linux
 Fingerprint Microsoft Windows NT 4.0
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:4.0 auto
 SEQ(R=N)
 OPS(O1=|M5B4%O2=%O3=%O4=%O5=%O6=)
 WIN(W1=0|FAF0%W2=0%W3=0%W4=0%W5=0%W6=0)
@@ -71550,7 +71815,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # windows NT 4 (Standard)
 Fingerprint Microsoft Windows NT 4.0 SP0
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::- auto
+CPE cpe:/o:microsoft:windows_nt:4.0:- auto
 SEQ(SP=F4-FE%GCD=1-6%ISR=F7-101%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
 WIN(W1=2058%W2=2058%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71569,7 +71834,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Version 4.0 (Build 1381: Service Pack 3)
 Fingerprint Microsoft Windows NT 4.0 SP3
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp3 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp3 auto
 SEQ(SP=11-3B%GCD=1-6|A|14|1E|28|32%ISR=4B-55%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71587,7 +71852,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Microsoft Windows NT 4.0 SP5
 Fingerprint Microsoft Windows NT 4.0 SP5
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp5 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp5 auto
 SEQ(SP=7A-7C%GCD=1-6%ISR=7A-7C%TI=RD%II=RI%TS=U)
 OPS(O1=|M5B4%O2=M5B4%O3=M5B4%O4=|M5B4%O5=|M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71610,7 +71875,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows NT 4.0 SP5 - SP6a
 Class Microsoft | Windows | NT | general purpose
 CPE cpe:/o:microsoft:windows_nt::sp6a
-CPE cpe:/o:microsoft:windows_nt::sp5 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp5 auto
 SEQ(SP=20-90%GCD=1-6%ISR=30-A1%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71629,7 +71894,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Microsoft Windows NT Version  4.0 (Build 1381: Service Pack 6)
 Fingerprint Microsoft Windows NT 4.0 SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=28-FE%GCD=1-6%ISR=2B-E9%TI=BI|RI%II=BI%SS=O|S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=7210%W2=7210%W3=7210%W4=7210%W5=7210%W6=7210)
@@ -71647,7 +71912,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Microsoft Windows NT 4 Server Service Pack 6 Build 1381
 Fingerprint Microsoft Windows NT 4.0 SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=FC-106%GCD=1-6%ISR=104-10E%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
 WIN(W1=2058%W2=2058%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71665,7 +71930,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Verion 4.0 (Build 1381: Service PAck 6)
 Fingerprint Microsoft Windows NT 4.0 SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=0-9E%GCD=1-6%ISR=0-95%TI=BI%TS=U)
 OPS(O1=M558%O2=M558%O3=M558%O4=M558%O5=M558%O6=M558)
 WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
@@ -71683,7 +71948,7 @@ IE(R=N)
 # Version 4.0 (Build 1381: Service Pack 6)
 Fingerprint Microsoft Windows NT 4.0 SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=25-2F%GCD=1-6%ISR=31-3B%TI=BI%CI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
@@ -71701,7 +71966,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Microsoft Windows NT 4.0 SP6
 Fingerprint Microsoft Windows NT 4.0 SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=29-33%GCD=1-6%ISR=30-3A%TI=BI%CI=BI%II=BI%SS=O%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=%O6=)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=0%W6=0)
@@ -71719,7 +71984,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Version 4.0 (Build 1381: Service Pack 6) Revised Service Pack 6a
 Fingerprint Microsoft Windows NT 4.0 SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=7B-89%GCD=1-6%ISR=96-A0%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
@@ -71738,7 +72003,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows NT 4.0 SP6a
 Class Microsoft | Windows | NT | general purpose
 CPE cpe:/o:microsoft:windows_nt::sp6a
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:4.0 auto
 SEQ(SP=7F-89%GCD=1-6%ISR=96-A0%TI=BI%II=BI%SS=O%TS=U)
 OPS(O1=|M5B4%O2=|M5B4%O3=|M5B4%O4=|M5B4%O5=%O6=)
 WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=0%W6=0)
@@ -71757,7 +72022,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows NT 4.0 SP6a
 Class Microsoft | Windows | NT | general purpose
 CPE cpe:/o:microsoft:windows_nt::sp6a
-CPE cpe:/o:microsoft:windows_nt auto
+CPE cpe:/o:microsoft:windows_nt:4.0 auto
 SEQ(SP=2F-39%GCD=1-6%ISR=2E-38%TI=BI%CI=BI%II=BI%SS=O%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=%O6=)
 WIN(W1=7210%W2=7210%W3=7210%W4=7210%W5=0%W6=0)
@@ -71811,7 +72076,7 @@ IE(R=N)
 # Windows NT Version 4.0, NT 4.0 SP7
 Fingerprint Microsoft Windows NT 4.0 SP7
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp7 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp7 auto
 SEQ(SP=FB-105%GCD=1-6%ISR=107-111%TI=BI%CI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
@@ -71830,7 +72095,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Version 4.0 (Build 1381:Service Pack 6)
 Fingerprint Microsoft Windows NT 4.0 Terminal Server Edition SP6
 Class Microsoft | Windows | NT | general purpose
-CPE cpe:/o:microsoft:windows_nt::sp6 auto
+CPE cpe:/o:microsoft:windows_nt:4.0:sp6 auto
 SEQ(SP=7D-95%GCD=1-6%ISR=97-A1%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
@@ -78245,6 +78510,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)
 
+# RouterOS 6.32.1.
+Fingerprint MikroTik RouterOS 6.32.1
+Class MikroTik | RouterOS | 6.X | router
+CPE cpe:/o:mikrotik:routeros:6.32.1 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=108-112%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M564ST11NW4%O2=M564ST11NW4%O3=M564NNT11NW4%O4=M564ST11NW4%O5=M564ST11NW4%O6=M564ST11)
+WIN(W1=3890%W2=3890%W3=3890%W4=3890%W5=3890%W6=3890)
+ECN(R=Y%DF=Y%T=3C-46%TG=40%W=3908%O=M564NNSNW4%CC=Y%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=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)
+
 # MikroTik RB2011UiAS-2HnD running RouterOS v6.33 and the firmware version is 3.24
 Fingerprint MikroTik RouterOS 6.33
 Class MikroTik | RouterOS | 6.X | router
@@ -78319,9 +78602,10 @@ 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)
 
 # Lighting controller: http://www.milight.com/milight-wifi-receiver-bridge-3-0-controller-box/
+# Wifi Light controller
 Fingerprint Milight WiFi Receiver bridge
 Class Milight | embedded || specialized
-SEQ(SP=55-5F%GCD=1-6%ISR=84-8E%TI=I|RD%CI=I%II=RI%SS=S%TS=U)
+SEQ(SP=45-5F%GCD=1-6%ISR=84-9F%TI=I|RD%CI=I%II=RI%SS=S%TS=U)
 OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
 WIN(W1=5DC%W2=5DC%W3=5DC%W4=5DC%W5=5DC%W6=5DC)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%O=M578%CC=N%Q=)
@@ -79021,6 +79305,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)
 
+# RFS6000 WiFi controller appliance running Wi-NG OS
+Fingerprint Motorola RFS6000 Wireless Controller
+Class Motorola | embedded || WAP
+CPE cpe:/h:motorola:rfs6000
+SEQ(SP=FC-106%GCD=2|4|6|8|A%ISR=108-112%TI=I%II=I%SS=S%TS=21)
+OPS(O1=M574ST11%O2=M574ST11%O3=M574NNT11%O4=ST11%O5=M574ST11%O6=M574ST11)
+WIN(W1=1%W2=3F%W3=4%W4=4%W5=10%W6=200)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=M574%CC=N%Q=RU)
+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=7A69%S=O%A=S+%F=AS%O=M574ST11%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Motorola SURFboard\302\256 SBG900 Wireless Cable Modem Gateway
 # Motorola SURFboard SBG900, Software version: SBG900-2.1.9.2-SCM03-NOSH
 # SMC 8014
@@ -79490,6 +79792,24 @@ T7(R=N)
 U1(DF=N%T=7B-85%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
+# NetAppp C-MODE CIFS Interface.
+Fingerprint NetApp Data ONTAP 8
+Class NetApp | Data ONTAP | 8.X | storage-misc
+CPE cpe:/o:netapp:data_ontap:8 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=104-10E%TI=BI|RD%CI=RD%II=BI%SS=S%TS=A)
+OPS(O1=M5B4NNSNW7NNT11%O2=M5B4NNSNW7NNT11%O3=M5B4NW7NNT11%O4=M5B4NNSNW7NNT11%O5=M5B4NNSNW7NNT11%O6=M5B4NNSNNT11)
+WIN(W1=832C%W2=8340%W3=8200%W4=8000%W5=81D0%W6=805C)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=832C%O=M5B4NNSNW7%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=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%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=Y%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=Y%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # NetApp Release 8.0.1P1D3 7-Mode: Mon Feb 28 22:53:14 PST 2011
 Fingerprint NetApp Data ONTAP 8.0.1P1D3
 Class NetApp | Data ONTAP | 8.X | storage-misc
@@ -79925,10 +80245,11 @@ 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)
 
 # NetBSD xs2.lan 7.0_BETA NetBSD 7.0_BETA (GENERIC) #0: Sun Sep 28 15:31:00 PDT 2014 amd64
-Fingerprint NetBSD 7.0_BETA
+# NetBSD 7.0 NetBSD 7.0 (GENERIC.201509250726Z) amd64
+Fingerprint NetBSD 7.0
 Class NetBSD | NetBSD | 7.X | general purpose
-CPE cpe:/o:netbsd:netbsd:7.0_beta auto
-SEQ(SP=D2-DC%GCD=1-6%ISR=D7-E1%TI=Z%CI=Z)
+CPE cpe:/o:netbsd:netbsd:7.0 auto
+SEQ(SP=D0-DC%GCD=1-6%ISR=D7-E1%TI=Z%CI=Z)
 OPS(O1=M8348NW3NNT11SNN%O2=M8348NW3NNT11SNN%O3=M8348NW3NNT11%O4=M8348NW3NNT11SNN%O5=M8348NW3NNT11SNN%O6=M8348NNT11SNN)
 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=M8348NW3SNN%CC=N%Q=)
@@ -79942,6 +80263,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=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# NetBSD 7.0 NetBSD 7.0 (GENERIC.201509250726Z) i386
+Fingerprint NetBSD 7.0
+Class NetBSD | NetBSD | 7.X | general purpose
+CPE cpe:/o:netbsd:netbsd:7.0 auto
+SEQ(SP=D1-DB%GCD=1-6%ISR=D7-E1%TI=Z%CI=Z%II=I)
+OPS(O1=M5B4NW3NNT11SNN%O2=M5B4NW3NNT11SNN%O3=M5B4NW3NNT11%O4=M5B4NW3NNT11SNN%O5=M5B4NW3NNT11SNN%O6=M5B4NNT11SNN)
+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=M5B4NW3SNN%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=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)
+
 # Netburner MOD5270 Single-board Computer. (Possibly running uC/OS RTOS.)
 # Zebra Z4Mplus
 Fingerprint NetBurner MOD5270 Ethernet module or Zebra Z4MPlus label printer
@@ -79979,6 +80318,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)
 
+# Netgear CM500 cable modem
+Fingerprint Netgear CM500 cable modem
+Class Netgear | embedded || broadband router
+CPE cpe:/h:netgear:cm500 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=102-10C%TI=I%TS=7)
+OPS(O1=M200NW0NNT11%O2=M200NW0NNT11%O3=M200NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=M200NNT11)
+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=M200NW0%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(R=N)
+IE(R=N)
+
 # Netgear DM602 ADSL router/modem firmware version 3.05NUT17-1.38.030131d
 Fingerprint Netgear DM602 ADSL router
 Class Netgear | embedded || broadband router
@@ -83610,6 +83967,42 @@ 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 5.9 GENERIC.MP#1888 amd64
+Fingerprint OpenBSD 5.9
+Class OpenBSD | OpenBSD | 5.X | general purpose
+CPE cpe:/o:openbsd:openbsd:5.9 auto
+SEQ(SP=FC-106%GCD=1-6%ISR=102-110%TI=RD%CI=RI%II=RI%TS=21|22)
+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=N%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=N%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 5.9 GENERIC#1761 amd64
+Fingerprint OpenBSD 5.9
+Class OpenBSD | OpenBSD | 5.X | general purpose
+CPE cpe:/o:openbsd:openbsd:5.9 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=101-10B%TI=RD%CI=RI%II=RI%TS=U)
+OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
+WIN(W1=0%W2=0%W3=0%W4=0%W5=0%W6=0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=0%O=M5B4%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=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)
+
 # SNAP PAC Ethernet Brain 2
 Fingerprint Opto 22 SNAP-PAC-EB2 I/O controller
 Class Opto 22 | embedded || specialized
@@ -83736,14 +84129,33 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
+# SunOS 5.11 11.3 i86pc i386 i86pc
+Fingerprint Oracle Solaris 11
+Class Oracle | Solaris | 11 | general purpose
+CPE cpe:/o:oracle:solaris:11 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=107-111%TI=I%TS=7)
+OPS(O1=ST11M5B4NW1%O2=ST11M5B4NW1%O3=NNT11M5B4NW1%O4=ST11M5B4NW1%O5=ST11M5B4NW1%O6=ST11M5B4)
+WIN(W1=FBB4%W2=FC1E%W3=FA38%W4=FABE%W5=FABE%W6=FFF7)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FAF0%O=M5B4NNSNW1%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=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=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=Y%T=FA-104%TG=FF%CD=S)
+
 # SunOS solaris 5.11 11.2 i86pc i386 i86pc
 # SunOS openindiana 5.11 illumos-7fc68dd i86pc i386 i86pc
+# SunOS openindiana 5.11 illumos-f83b46b i86pc i386 i86pc
 Fingerprint Oracle Solaris 11 or OpenIndiana
 Class Oracle | Solaris | 11 | general purpose
 CPE cpe:/o:oracle:solaris:11 auto
 Class illumos | OpenIndiana || general purpose
 CPE cpe:/o:illumos:openindiana auto
-SEQ(SP=FA-108%GCD=1-6%ISR=FF-111%TI=I%CI=I%II=I%SS=S%TS=7)
+SEQ(SP=F2-108%GCD=1-6%ISR=FF-111%TI=I%CI=I%II=I%SS=S%TS=7)
 OPS(O1=ST11M5B4NW1%O2=ST11M5B4NW1%O3=NNT11M5B4NW1%O4=ST11M5B4NW1%O5=ST11M5B4NW1%O6=ST11M5B4)
 WIN(W1=FBB4%W2=FC1E%W3=FA38%W4=FABE%W5=FABE%W6=FFF7)
 ECN(R=Y%DF=Y%T=37-41%TG=40%W=FAF0%O=M5B4NNSNW1%CC=Y%Q=)
@@ -84703,7 +85115,7 @@ Class Philips | embedded || specialized
 CPE cpe:/h:philips:hue_bridge
 Class lwIP | lwIP || general purpose
 CPE cpe:/a:lwip_project:lwip auto
-SEQ(SP=8C-DE%GCD=1-6%ISR=BA-C4%TI=I%CI=I%II=I|RI%SS=O|S%TS=U)
+SEQ(SP=8C-DE%GCD=1-6%ISR=BA-E0%TI=I%CI=I%II=I|RI%SS=O|S%TS=U)
 OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M218)
 WIN(W1=860%W2=860%W3=860%W4=860%W5=860%W6=860)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=860%O=M218%CC=N%Q=)
@@ -85430,6 +85842,23 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# Priva heating control manager
+Fingerprint Priva heating control manager
+Class Priva | embedded || specialized
+SEQ(SP=C2-CC%GCD=1-6%ISR=C5-CF%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW2%O2=M5B4ST11NW2%O3=M5B4NNT11NW2%O4=M5B4ST11NW2%O5=M5B4ST11NW2%O6=M5B4ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=39-43%TG=40%W=16D0%O=M5B4NNSNW2%CC=Y%Q=)
+T1(R=Y%DF=Y%T=39-43%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=39-43%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=39-43%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=39-43%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=39-43%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=39-43%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=39-43%TG=40%CD=S)
+
 # Proxim Tsunami MP11a BSU (802.11a).
 Fingerprint Proxim Tsunami MP.11a WAP
 Class Proxim | embedded || WAP
@@ -85486,6 +85915,8 @@ IE(DFI=S%T=2F-39%TG=40%CD=S)
 Fingerprint QNAP TS-109 NAS device (Linux 2.6.32)
 Class QNAP | embedded || storage-misc
 CPE cpe:/h:qnap:ts-109 auto
+Class Linux | Linux | 2.6.X | storage-misc
+CPE cpe:/o:linux:linux_kernel:2.6.32 auto
 SEQ(SP=104-10E%GCD=1-6%ISR=104-10E%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5ACST11NW4%O2=M5ACST11NW4%O3=M5ACNNT11NW4%O4=M5ACST11NW4%O5=M5ACST11NW4%O6=M5ACST11)
 WIN(W1=1680%W2=1680%W3=1680%W4=1680%W5=1680%W6=1680)
@@ -85500,11 +85931,55 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%RD=0)
 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)
 
-# QNAP TS-209 Pro running Linux 2.6.12.6-arm1
-# Linux NAS 2.6.12.6-arm1 #6 Wed Jul 8 15:11:08 CST 2009 armv5tejl GNU/Linux
-Fingerprint QNAP TS-209 NAS device (Linux 2.6.12.6-arm1)
+# Linux QNAP 2.6.12.6-arm1 #2 Sun Sep 18 02:09:29 CST 2011 armv5tejl unknown
+Fingerprint QNAP TS-209 NAS device (Linux 2.6.12)
 Class QNAP | embedded || storage-misc
 CPE cpe:/h:qnap:ts-209 auto
+Class QNAP | QTS | 4.X | storage-misc
+CPE cpe:/o:qnap:qts:4 auto
+Class Linux | Linux | 2.6.X | storage-misc
+CPE cpe:/o:linux:linux_kernel:2.6.12 auto
+SEQ(SP=BA-C4%GCD=1-6%ISR=C0-CA%TI=Z%II=I%TS=7)
+OPS(O1=M2304ST11NW2%O2=M2304ST11NW2%O3=M2304NNT11NW2%O4=M2304ST11NW2%O5=M2304ST11NW2%O6=M2304ST11)
+WIN(W1=45F0%W2=45F0%W3=45F0%W4=45F0%W5=45F0%W6=45F0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4608%O=M2304NNSNW2%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=45F0%S=O%A=S+%F=AS%O=M2304ST11NW2%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# QNAP TS-859 running QTS 4.0.3
+# QNAP TS-439 running QTS 4.0.7, TS-439 is an oldish NAS appliance.
+# QTS 4.2.0 
+Fingerprint QNAP QTS 4.0 - 4.2
+Class QNAP | QTS | 4.X | storage-misc
+CPE cpe:/o:qnap:qts:4 auto
+SEQ(SP=ED-109%GCD=1-6%ISR=FD-110%TI=Z%CI=Z%II=I%TS=A|B)
+OPS(O1=MFC2ST11NW7%O2=MFC2ST11NW7%O3=MFC2NNT11NW7%O4=MFC2ST11NW7%O5=MFC2ST11NW7%O6=MFC2ST11)
+WIN(W1=2F22%W2=2F22%W3=2F22%W4=2F22%W5=2F22%W6=2F22)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2F46%O=MFC2NNSNW7%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)
+
+# QNAP TS-209 Pro running Linux 2.6.12.6-arm1
+# Linux NAS 2.6.12.6-arm1 #6 Wed Jul 8 15:11:08 CST 2009 armv5tejl GNU/Linux
+Fingerprint QNAP QTS NAS device (Linux 2.6.12)
+Class QNAP | QTS || storage-misc
+CPE cpe:/o:qnap:qts auto
+Class Linux | Linux | 2.6.X | storage-misc
+CPE cpe:/o:linux:linux_kernel:2.6.12 auto
 SEQ(SP=C1-CF%GCD=1-6%ISR=B8-D6%TI=Z%CI=I%II=I%TS=7)
 OPS(O1=M2304ST11NW2%O2=M2304ST11NW2%O3=M2304NNT11NW2%O4=M2304ST11NW2%O5=M2304ST11NW2%O6=M2304ST11)
 WIN(W1=45F0%W2=45F0%W3=45F0%W4=45F0%W5=45F0%W6=45F0)
@@ -85519,42 +85994,6 @@ 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)
 
-# QNAP TS-439 running QTS 4.0.7, TS-439 is an oldish NAS appliance.
-Fingerprint QNAP TS-439 NAS (QTS 4.0.7)
-Class QNAP | QTS | 4.X | storage-misc
-CPE cpe:/o:qnap:qts:4.0.7 auto
-SEQ(SP=ED-F7%GCD=1-6%ISR=FD-107%TI=Z%CI=Z%II=I%TS=A)
-OPS(O1=MFC2ST11NW7%O2=MFC2ST11NW7%O3=MFC2NNT11NW7%O4=MFC2ST11NW7%O5=MFC2ST11NW7%O6=MFC2ST11)
-WIN(W1=2F22%W2=2F22%W3=2F22%W4=2F22%W5=2F22%W6=2F22)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2F46%O=MFC2NNSNW7%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)
-
-# QNAP TS-859 running QTS 4.0.3
-Fingerprint QNAP TS-859 NAS (QTS 4.0.3)
-Class QNAP | QTS | 4.X | storage-misc
-CPE cpe:/o:qnap:qts:4.0.3 auto
-SEQ(SP=FF-109%GCD=1-6%ISR=104-10E%TI=Z%CI=Z%II=I%TS=A|B)
-OPS(O1=MFC2ST11NW7%O2=MFC2ST11NW7%O3=MFC2NNT11NW7%O4=MFC2ST11NW7%O5=MFC2ST11NW7%O6=MFC2ST11)
-WIN(W1=2F22%W2=2F22%W3=2F22%W4=2F22%W5=2F22%W6=2F22)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2F46%O=MFC2NNSNW7%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)
-
 # QNX 4.X
 Fingerprint QNX 4
 Class QNX | QNX | 4.X | specialized
@@ -85856,6 +86295,23 @@ 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)
 
+# Raritan Dominion KX II KVM
+Fingerprint Raritan Dominion KX II KVM
+Class Raritan | embedded || remote management
+SEQ(SP=C8-D2%GCD=1-6%ISR=CB-D5%TI=Z%CI=Z%II=I%TS=8)
+OPS(O1=M56AST11NW2%O2=M56AST11NW2%O3=M56ANNT11NW2%O4=M56AST11NW2%O5=M56AST11NW2%O6=M56AST11)
+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=M56ANNSNW2%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Raritan Dominion KX-II KVM switch, which runs linux: RFC1213-MIB::sysObjectID.0 = OID: NET-SNMP-TC::linux
 Fingerprint Raritan Dominion KX II KVM switch
 Class Raritan | embedded || remote management
@@ -86323,6 +86779,40 @@ 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)
 
+# Rigol DS1054z Oscilloscope
+Fingerprint Rigol DS1000Z-series oscilloscope
+Class Rigol Technologies | embedded || specialized
+SEQ(SP=F7-109%GCD=1-6%ISR=107-111%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=111C%W2=111C%W3=111C%W4=111C%W5=111C%W6=111C)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=111C%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=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)
+
+# Rigol DS1000Z series Oscilloscope
+Fingerprint Rigol DS1000Z-series oscilloscope
+Class Rigol Technologies | embedded || specialized
+SEQ(SP=F6-100%GCD=1-6%ISR=104-10E%TI=I%CI=I|RI%TS=U)
+OPS(O1=%O2=%O3=%O4=%O5=%O6=)
+WIN(W1=111C%W2=111C%W3=111C%W4=111C%W5=111C%W6=111C)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=111C%O=%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # Rigol Technologies DSG3060 Signal Generator
 Fingerprint Rigol DSG3060 signal generator
 Class Rigol Technologies | embedded || specialized
@@ -86576,24 +87066,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)
 
-# Riverbed Steelhead running RiOS 9.1.0a (Looks like Linux 2.6.32 -- Ed.)
-Fingerprint Riverbed RiOS 9.1.0a
-Class Riverbed | RiOS | 9.X | specialized
-CPE cpe:/o:riverbed:rios:9.1.0a auto
-SEQ(SP=100-10A%GCD=1-6%ISR=107-111%TI=Z%CI=Z%II=I%TS=A)
-OPS(O1=M5B4ST11NW2%O2=M5B4ST11NW2%O3=M5B4NNT11NW2%O4=M5B4ST11NW2%O5=M5B4ST11NW2%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=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)
-
 # Riverbed RIOS
 Fingerprint Riverbed RiOS
 Class Riverbed | RiOS || specialized
@@ -88705,6 +89177,26 @@ T7(R=N)
 U1(DF=N%T=41%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=41%TG=40%CD=S)
 
+# optipoint economic 410 (VxWorks evidence: https://www.kb.cert.org/vuls/id/JALR-87RHGP)
+Fingerprint Siemens optiPoint 410 VoIP phone (VxWorks)
+Class Siemens | embedded || VoIP phone
+CPE cpe:/h:siemens:optipoint_410 auto
+Class Wind River | VxWorks || VoIP phone
+CPE cpe:/o:windriver:vxworks auto
+SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=99-A3%TI=I|RD%CI=I%II=I%SS=S%TS=1)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=O%A=O%F=A%O=NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=2000%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=Z%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # Siemens Gigaset SE551 WLAN dsl/cable router
 Fingerprint Siemens Gigaset SE551 wireless broadband router
 Class Siemens | embedded || WAP
@@ -88870,6 +89362,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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# Silicondust HD Homerun with firmware 20150826
+# HDHOMERUN PRIME Cable Card Television Tuner
+Fingerprint Silicondust HDHomeRun set top box
+Class Silicondust | embedded || media device
+SEQ(SP=A6-B0%GCD=1-6%ISR=AD-B7%TI=I%CI=I|RI%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4NW0)
+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=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=1000%S=O%A=S+%F=AS%O=M5B4NW0%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=Z)
+
 # Sipura SPA-1001 VoIP adapter; Software Version 2.0.10(e); Hardware Version 2.0.1(9799)
 # Sipura SPA-3000 VoIP adapter
 Fingerprint Sipura SPA1001 or SPA3000 VoIP adapter
@@ -92381,6 +92891,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)
 
+# Synology DS411j running DSM 5.2-5644 Update 1
+Fingerprint Synology DiskStation Manager 5.2-5644
+Class Synology | DiskStation Manager | 5.X | storage-misc
+CPE cpe:/a:synology:diskstation_manager:5.2 auto
+SEQ(SP=C4-CE%GCD=1-6%ISR=CB-D5%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW2%O2=M5B4ST11NW2%O3=M5B4NNT11NW2%O4=M5B4ST11NW2%O5=M5B4ST11NW2%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=M5B4NNSNW2%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)
+
+# Synology NAS DS1010+ running DSM 5.2-5644 Update 5
+Fingerprint Synology DiskStation Manager 5.2-5644
+Class Synology | DiskStation Manager | 5.X | storage-misc
+CPE cpe:/a:synology:diskstation_manager:5.2 auto
+SEQ(SP=F5-FF%GCD=1-6%ISR=103-10D%TI=Z%CI=I|RD%II=I%TS=A|B|D)
+OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%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=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)
+
 # DSM 6 on DS213+, Linux 2.6.32.12 #7135 SMP Thu Oct 15 13:34:36 CST 2015 ppc GNU/Linux synology_qoriq_213+
 Fingerprint Synology DiskStation Manager 6 (Linux 2.6.32)
 Class Synology | DiskStation Manager | 6.X | storage-misc
@@ -93278,6 +93824,24 @@ T7(R=N)
 U1(DF=N%T=F8-102%TG=FF%IPL=38%UN=0%RIPL=15C%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=F8-102%TG=FF%CD=S)
 
+# Toshiba 4690 OS Version 6
+Fingerprint Toshiba 4960 OS point-of-sale system
+Class Toshiba | 4960 OS | 6.X | specialized
+CPE cpe:/o:toshiba:4960_operating_system:6
+SEQ(SP=C-16%GCD=600|C00|1200|1800|1E00%ISR=6C-76%TI=I%CI=Z%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=19-23%TG=20%W=7000%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=19-23%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=19-23%TG=20%W=7000%S=O%A=O%F=A%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=19-23%TG=20%W=7000%S=A%A=Z%F=R%RD=0)
+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=S%T=FA-104%TG=FF%CD=S)
+
 # Toshiba Digital television set (REGZA series)
 Fingerprint Toshiba REGZA TV
 Class Toshiba | embedded || media device
@@ -93605,6 +94169,42 @@ T7(R=Y%DF=N%T=74-7E%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=74-7E%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
 IE(DFI=N%T=74-7E%TG=80%CD=Z)
 
+# Tripp Lite UPS SMART3000RMXL2U
+Fingerprint Tripp Lite SMART3000RMXL2U UPS
+Class Tripp Lite | embedded || power-device
+CPE cpe:/h:tripplite:smart3000rmxl2u
+SEQ(SP=8C-96%GCD=1-6%ISR=98-A2%TI=I|RD%II=I%TS=A|B)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=43E0%W2=4110%W3=423C%W4=43E0%W5=4180%W6=403D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4470%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=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=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)
+
+# PowerAlert 12.06.0061, NetOS 7.5.2tl
+Fingerprint Tripp Lite NetOS 7.5.2tl
+Class Tripp Lite | NetOS | 7.X | specialized
+CPE cpe:/o:tripplite:netos:7.5.2tl auto
+SEQ(CI=RD)
+OPS(O1=M564NW0NNSNNT11%O2=M564NW0NNSNNT11%O3=M280NW0NNT11%O4=M564NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=4020%W2=4020%W3=423C%W4=43E0%W5=4180%W6=403D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=40B0%O=M564NW0NNS%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=FD-107%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FD-107%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=FD-107%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=FD-107%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FD-107%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=G%RUD=G)
+IE(R=N)
+
 # TUT Systems SMS2000
 Fingerprint Tut Systems SMS2000 subscriber management system
 Class Tut Systems | embedded || router
@@ -93701,6 +94301,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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# XW.v5.5.9 Build Number: 21734
+Fingerprint Ubiquiti AirOS 5.5.9
+Class Ubiquiti | AirOS | 5.X | WAP
+CPE cpe:/o:ubnt:airos:5.5.9 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=108-112%TI=Z%CI=Z%II=I%TS=A)
+OPS(O1=M55CST11NW1%O2=M55CST11NW1%O3=M55CNNT11NW1%O4=M55CST11NW1%O5=M55CST11NW1%O6=M55CST11)
+WIN(W1=1650%W2=1650%W3=1650%W4=1650%W5=1650%W6=1650)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=1680%O=M55CNNSNW1%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)
+
 # Ubiquity Picostation M2, Firmware Version:       XM.v5.6.2
 Fingerprint Ubiquiti AirOS 5.6.2 (Linux 2.6.32)
 Class Ubiquiti | AirOS | 5.X | WAP
@@ -93721,6 +94339,25 @@ 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)
 
+# Edgemax POE Router Firmware 1.7: Linux 3.10.20-UBNT (root@ubnt-builder2) (gcc version 4.7.0 (Cavium Inc. Version: SDK_3_1_0_p2 build 34) ) #1 SMP Tue Jun 16 12:05:05 P
+Fingerprint Ubiquiti Edgemax router firmware 1.7.0 (Linux 3.10)
+Class Ubiquiti | embedded || router
+Class Linux | Linux | 3.X | router
+CPE cpe:/o:linux:linux_kernel:3.10 auto
+SEQ(SP=F4-FE%GCD=1-6%ISR=102-10C%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M2300ST11NW6%O2=M2300ST11NW6%O3=M2300NNT11NW6%O4=M2300ST11NW6%O5=M2300ST11NW6%O6=M2300ST11)
+WIN(W1=45E8%W2=45E8%W3=45E8%W4=45E8%W5=45E8%W6=45E8)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4600%O=M2300NNSNW6%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)
+
 # EdgeSwitch 48-Port 500W, v1.0.0.4664592, Linux 3.6.5-f4a26ed5
 Fingerprint Ubiquiti EdgeSwitch (Linux 3.6)
 Class Ubiquiti | embedded || switch
@@ -93760,6 +94397,25 @@ 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)
 
+# Ubiquiti webcam: Linux version 2.6.38.8 (sa_jenkins@sj-vid-build01) (gcc version 4.7.3 (OpenWrt/Linaro GCC 4.7-2013.03 unknown) ) #1 PREEMPT Thu Jun 25 23:09:31 UTC 2015
+Fingerprint Ubiquiti webcam (Linux 2.6.38)
+Class Ubiquiti | embedded || webcam
+Class Linux | Linux | 2.6.X | webcam
+CPE cpe:/o:linux:linux_kernel:2.6.38 auto
+SEQ(SP=CB-D5%GCD=2|4|6|8|A%ISR=C8-D2%TI=Z%CI=Z%TS=7)
+OPS(O1=M5B4ST11NW3%O2=M5B4ST11NW3%O3=M5B4NNT11NW3%O4=M5B4ST11NW3%O5=M5B4ST11NW3%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=M5B4NNSNW3%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=3890%S=O%A=S+%F=AS%O=M5B4ST11NW3%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Universal Devices: Model: ISY 99i 1024 IR. Platform: ISY-C-99. Version: 3.2.5. http://www.universal-devices.com/99i.htm
 Fingerprint Universal Devices ISY-99i IR receiver
 Class Universal Devices | embedded || media device
@@ -95195,6 +95851,25 @@ 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)
 
+# Websense proxy server, Linux-based
+Fingerprint Websense Content Gateway
+Class WebSense | embedded || proxy server
+Class Linux | Linux || proxy server
+CPE cpe:/o:linux:linux_kernel auto
+SEQ(SP=F9-105%GCD=1-6%ISR=106-110%TI=Z%CI=Z%II=I%TS=A)
+OPS(O1=M598ST11NW7%O2=M598ST11NW7%O3=M598NNT11NW7%O4=M598ST11NW7%O5=M598ST11NW7%O6=M598ST11)
+WIN(W1=3778%W2=3778%W3=3778%W4=3778%W5=3778%W6=3778)
+ECN(R=Y%DF=Y%T=3A-44%TG=40%W=37F0%O=M598NNSNW7%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3A-44%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=3A-44%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+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)
+
 # Welltech ATA-171 h323 VoIP Gateway SIP build-in NAT Firmware Version: s1_105
 Fingerprint Welltech ATA-171 VoIP adapter
 Class Welltech | embedded || VoIP adapter
@@ -96631,6 +97306,24 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=Z%F=R%O=%RD=0%Q=)
 U1(DF=N%T=96-A0%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
+# Fuji/Xerox cm205fw code version 01.00.07.
+Fingerprint Fuji Xerox DocuPrint CM205 printer
+Class Xerox | embedded || printer
+CPE cpe:/h:xerox:docuprint_cm205 auto
+SEQ(SP=0-5%GCD=FA01|1F402|2EE03|3E804|4E205%ISR=95-9F%TI=BI%CI=BI%II=BI%SS=S%TS=U)
+OPS(O1=M5A0NW0%O2=M5A0NW0%O3=M5A0NW0%O4=M5A0NW0%O5=M5A0NW0%O6=M5A0)
+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=M5A0NW0%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=R%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=R%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=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=R%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=S%T=3B-45%TG=40%CD=Z)
+
 # Xerox ApeosPort-IV C3370 (Probably VxWorks -- Ed.)
 Fingerprint Xerox ApeosPort-IV C3370 printer
 Class Xerox | embedded || printer
@@ -97553,13 +98246,14 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=B18B%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Zyxel Keenetyc Giga, release: v2.04(USD.1)C6
-Fingerprint ZyXEL Keenetic Giga WAP
+# Keenetic Extra NDMS v2.05(AANS.5)C2
+# NDMS v2.05(AAFS.5)C2
+Fingerprint ZyXEL Keenetic Giga WAP 2.04 - 2.05
 Class ZyXEL | embedded || WAP
-CPE cpe:/h:zyxel:keenetic_giga
-SEQ(SP=C6-D0%GCD=1-6%ISR=CD-D7%TI=Z%CI=Z%TS=A)
+SEQ(SP=C6-D0%GCD=1-6%ISR=CD-D7%TI=Z%CI=Z%TS=7|A)
 OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%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=M5B4NNSNW6%CC=N%Q=)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW6%CC=Y|N%Q=)
 T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)
 T3(R=Y%DF=Y%T=3B-45%TG=40%W=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW6%RD=0%Q=)