diff --git a/nmap-os-db b/nmap-os-db
index defb25870..4cae78eb9 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -6230,7 +6230,8 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Darwin imac 14.1.0 Darwin Kernel Version 14.1.0: Thu Feb 26 19:26:47 PST 2015; root:xnu-2782.10.73~1/RELEASE_X86_64 x86_64
 # Darwin 14.5.0 Darwin Kernel Version 14.5.0: Wed Jul 29 02:26:53 PDT 2015; root:xnu-2782.40.9~1/RELEASE_X86_64 x86_64
 # iOS 9.3.2
-Fingerprint Apple Mac OS X 10.7.0 (Lion) - 10.11 (El Capitan) or iOS 4.1 - 9.3.3 (Darwin 10.0.0 - 15.6.0)
+# Darwin 16.1.0 Darwin Kernel Version 16.1.0: Mon Oct  3 14:03:15 PDT 2016; root:xnu-3789.21.3~20/RELEASE_X86_64 x86_64
+Fingerprint Apple Mac OS X 10.7.0 (Lion) - 10.12 (Sierra) or iOS 4.1 - 9.3.3 (Darwin 10.0.0 - 16.1.0)
 Class Apple | Mac OS X | 10.7.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.7
 Class Apple | OS X | 10.8.X | general purpose
@@ -6797,7 +6798,9 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
 # Localhost
 # 16.0.0 Darwin Kernel Version 16.0.0: Tue Aug 23 17:02:44 PDT 2016
-Fingerprint Apple macOS 10.12 (Sierra) (Darwin 16.0.0)
+# 16.1.0 Darwin Kernel Version 16.1.0: Mon Oct  3 14:03:15 PDT 2016; root:xnu-3789.21.3~20/RELEASE_X86_64 x86_64
+# 16.3.0 Darwin Kernel Version 16.3.0: Thu Nov 17 20:23:58 PST 2016; root:xnu-3789.31.2~1/RELEASE_X86_64 x86_64
+Fingerprint Apple macOS 10.12 (Sierra) (Darwin 16.0.0 - 16.3.0)
 Class Apple | macOS | 10.12.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.12 auto
 SEQ(SP=FA-106%GCD=1-6%ISR=108-112%TI=RD%CI=RD%II=RI%TS=A)
@@ -7012,7 +7015,8 @@ IE(R=N)
 # Darwin 15.2.0 (OS X 10.11.4)
 # Darwin 15.3.0 Darwin Kernel Version 15.3.0: Thu Dec 10 18:40:58 PST 2015; root:xnu-3248.30.4~1/RELEASE_X86_64 x86_64
 # Darwin 15.4.0 Darwin Kernel Version 15.4.0: Fri Feb 26 22:08:05 PST 2016; root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64
-Fingerprint Apple OS X 10.10 (Yosemite) - 10.11 (El Capitan) (Darwin 14.0.0 - 15.4.0)
+# Darwin 16.1.0 Darwin Kernel Version 16.1.0: Thu Oct 13 21:26:57 PDT 2016; root:xnu-3789.21.3~60/RELEASE_X86_64 x86_64
+Fingerprint Apple OS X 10.10 (Yosemite) - 10.12 (Sierra) (Darwin 14.0.0 - 16.1.0)
 Class Apple | OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10 auto
 Class Apple | OS X | 10.11.X | general purpose
@@ -28036,6 +28040,23 @@ T7(R=Y%DF=N%T=72-7C%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=72-7C%TG=80%IPL=240%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=>0%RUD=I)
 IE(DFI=N%T=72-7C%TG=80%CD=Z)
 
+# Arcam AVR550 (Frontier Silicon Venice 9)
+Fingerprint Frontier Silicon internet radio
+Class Frontier Silicon | embedded || media device
+SEQ(SP=CD-D7%GCD=1-6%ISR=F0-FA%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4W0L%O2=M5B4W0L%O3=M5B4W0L%O4=M5B4W0L%O5=M5B4W0L%O6=M5B4)
+WIN(W1=7918%W2=7918%W3=7918%W4=7918%W5=7918%W6=7918)
+ECN(R=Y%DF=N%T=6F-79%TG=80%W=7918%O=M5B4W0L%CC=N%Q=)
+T1(R=Y%DF=N%T=6F-79%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=6F-79%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=6F-79%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=6F-79%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=6F-79%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=6F-79%TG=80%IPL=240%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=BF00%RUD=I)
+IE(DFI=N%T=6F-79%TG=80%CD=Z)
+
 # FUJI XEROX ApeosPort-IV C2275
 Fingerprint Fuji Xerox ApeosPort IV C2275 printer
 Class Fuji Xerox | embedded || printer
@@ -29322,6 +29343,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Amazon Fire OS 5.0.3.1 (534011720)
 # Linux 3.10.49-g6359c68 #1 SMP PREEMPT Mon Jun 15 18:11:09 IST 2015 armv7l GNU/Linux
 # CyanogenOS 12.1, based on Android 5.1.1.
+# Patuoxun Smart Box TV 1080P, IPTV Box Android 4.4.4 Quad Core Streaming Media Player
 Fingerprint Android 4.1 - 6.0 (Linux 3.4 or 3.10)
 Class Google | Android | 4.X | phone
 CPE cpe:/o:google:android:4 auto
@@ -29505,6 +29527,44 @@ 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)
 
+# Elephone P8000, Android 5.1
+Fingerprint Android 5.1
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5.1 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=106-110%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M5B4ST11NW5%O2=M5B4ST11NW5%O3=M5B4NNT11NW5%O4=M5B4ST11NW5%O5=M5B4ST11NW5%O6=M5B4ST11)
+WIN(W1=A9B0%W2=A9B0%W3=A9B0%W4=A9B0%W5=A9B0%W6=A9B0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=A564%O=M5B4NNSNW5%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# 3.18.24-perf-g205fc04
+Fingerprint Android 6 (Linux 3.18)
+Class Google | Android | 6.X | phone
+CPE cpe:/o:google:android:6 auto
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3.18 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=Z%CI=I%TS=8)
+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=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)
+
 # Samsung Phone running Android Ver 6.0.1
 Fingerprint Android 6.0.1
 Class Google | Android | 6.X | phone
@@ -44147,6 +44207,25 @@ 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=S)
 
+# mbNET MDH816, Linux version 2.6.26-uc0 (gcc version 3.4.4) #50 Sun Apr 12 10:31:41 CEST 2015
+Fingerprint mbNET industrial router (Linux 2.6.26)
+Class Linux | Linux | 2.6.26 | router
+CPE cpe:/o:linux:linux_kernel:2.6.26 auto
+Class mbNet | embedded || specialized
+SEQ(SP=C8-D2%GCD=1-6%ISR=CE-D8%TI=Z%CI=Z%II=I%TS=U)
+OPS(O1=M536NNSNW2%O2=M536NNSNW2%O3=M536NW2%O4=M536NNSNW2%O5=M536NNSNW2%O6=M536NNS)
+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=M536NNSNW2%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)
+
 # DIR_300NRUB5 version 1.2.94
 Fingerprint D-Link DIR-300 NRU router (Linux 2.6.21)
 Class Linux | Linux | 2.6.X | broadband router
@@ -46840,6 +46919,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)
 
+# Linux 2.6.18-238.12.1.el5 #1 i686 i686 i386 GNU/Linux
+Fingerprint Linux 2.6.18
+Class Linux | Linux | 2.6.X | general purpose
+CPE cpe:/o:linux:linux_kernel:2.6.18 auto
+SEQ(SP=BD-C7%GCD=1-6%ISR=C1-CB%TI=Z%II=I%TS=A)
+OPS(O1=M529ST11NW7%O2=M529ST11NW7%O3=M529NNT11NW7%O4=M529ST11NW7%O5=M529ST11NW7%O6=M529ST11)
+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=M529NNSNW7%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)
+
 # CentOS 5: Linux 2.6.18-53.1.4.el5 #1 SMP Fri Nov 30 00:45:16 EST 2007 i686 athlon i386 GNU/Linux
 Fingerprint Linux 2.6.18 (CentOS 5)
 Class Linux | Linux | 2.6.X | general purpose
@@ -53354,6 +53451,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)
 
+# Linux 2.6.32-042stab102.9
+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=103-10D%GCD=1-6%ISR=107-111%TI=Z%CI=Z%II=I%TS=A)
+OPS(O1=MFFD7ST11NW7%O2=MFFD7ST11NW7%O3=MFFD7NNT11NW7%O4=MFFD7ST11NW7%O5=MFFD7ST11NW7%O6=MFFD7ST11)
+WIN(W1=FFCB%W2=FFCB%W3=FFCB%W4=FFCB%W5=FFCB%W6=FFCB)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFD7%O=MFFD7NNSNW7%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)
+
+# Linux 2.6.32-5-686 #1 SMP Mon Jun 13 04:13:06 UTC 2011 i686 GNU/Linux
+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=C4-CE%GCD=1-6%ISR=CE-D8%TI=Z%II=I%TS=8)
+OPS(O1=M529ST11NW5%O2=M529ST11NW5%O3=M529NNT11NW5%O4=M529ST11NW5%O5=M529ST11NW5%O6=M529ST11)
+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=M529NNSNW5%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)
+
 # Linux 2.6.32-30-generic #59-Ubuntu SMP Tue Mar 1 21:30:46 UTC 2011 x86_64 GNU/Linux
 # Linux 2.6.33.2 #1 date armv5tel unknown, Qnap 3.5.1 ( Firmware Version 3.5.1 Build 1002T )
 # MicroTik RouterOS v5.17
@@ -53931,24 +54064,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)
 
-# Linux 2.6.32-042stab102.9
-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=103-10D%GCD=1-6%ISR=107-111%TI=Z%CI=Z%II=I%TS=A)
-OPS(O1=MFFD7ST11NW7%O2=MFFD7ST11NW7%O3=MFFD7NNT11NW7%O4=MFFD7ST11NW7%O5=MFFD7ST11NW7%O6=MFFD7ST11)
-WIN(W1=FFCB%W2=FFCB%W3=FFCB%W4=FFCB%W5=FFCB%W6=FFCB)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFD7%O=MFFD7NNSNW7%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)
-
 # 2.6.33-1.fc13.x86_64 #1 SMP Wed Feb 24 19:55:32 UTC 2010 x86_64 x86_64 x86_64 GNU/Linux
 Fingerprint Linux 2.6.33
 Class Linux | Linux | 2.6.X | general purpose
@@ -58783,6 +58898,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)
 
+# Xiaomi Router 3 running Developer firmware v 2.13.75
+Fingerprint Xiaomi MiWiFi WAP (Linux 2.6.36)
+Class Linux | Linux | 2.6.X | WAP
+CPE cpe:/o:linux:linux_kernel:2.6.36 auto
+Class Xiaomi | embedded || WAP
+SEQ(SP=0-5%GCD=0%ISR=0-5%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=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=A%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)
+
 # Axis 207 camera, Linux axis-00408c928a44 2.6.16 #1 Mon Apr 16 13:20:03 CEST 2007 armv4tl unknown
 Fingerprint Axis 207 camera (Linux 2.6.16)
 Class Linux | Linux | 2.6.X | webcam
@@ -60360,7 +60494,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 3.18.26 #8771 Fri Feb 5 03:08:28 CET 2016 mips
 # Linux 3.18.31 DD-WRT
 # Linux  4.2.0-27-generic #32~14.04.1-Ubuntu SMP Fri Jan 22 15:32:26 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
-Fingerprint Linux 3.10 - 4.2
+# 4.8.6-201.fc24.x86_64 #1 SMP Thu Nov 3 14:38:57 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
+Fingerprint Linux 3.10 - 4.8
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
 Class Linux | Linux | 4.X | general purpose
@@ -60596,9 +60731,12 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 3.12.22+ #691 PREEMPT Wed Jun 18 18:29:58 BST 2014 armv6l GNU/Linux (WA)
 # 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
-Fingerprint Linux 3.12 - 3.18
+# 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
+Fingerprint Linux 3.12 - 4.4
 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=FC-106%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)
@@ -62024,7 +62162,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 4.2.0-2-ARCH #1 PREEMPT Mon Sep 7 03:47:39 MDT 2015 armv5tel GNU/Linux
 # Linux 4.4.0-12-generic #28-Ubuntu SMP Wed Mar 9 00:33:55 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
 # Linux 4.6.0-0.bpo.1-686-pae #1 SMP Debian 4.6.4-1~bpo8+1 (2016-08-11) i686 GNU/Linux
-Fingerprint Linux 3.2 - 4.6
+# Linux 4.8.3-x86_64-linode76 #1 SMP
+Fingerprint Linux 3.2 - 4.8
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
 Class Linux | Linux | 4.X | general purpose
@@ -63044,7 +63183,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 3.18.7-v7+ #755 SMP PREEMPT Thu Feb 12 17:20:48 GMT 2015 armv7l GNU/Linu
 # Linux 4.1.19-v7+ #858 SMP Tue Mar 15 15:56:00 GMT 2016 armv7l GNU/Linux
 # Linux 4.1.19-4-ARCH #1 SMP Wed Mar 9 18:23:02 MST 2016 armv7l GNU/Linux
-Fingerprint Linux 3.8 - 4.1
+# Linux 4.4.21-v7+ #911 SMP Thu Sep 15 14:22:38 BST 2016 armv7l GNU/Linux
+Fingerprint Linux 3.8 - 4.4
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
 Class Linux | Linux | 4.X | general purpose
@@ -63064,6 +63204,7 @@ 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
+# Deletion candidate: too broad?
 # Linux 3.11.6-1-ARCH #1 SMP PREEMPT Fri Oct 18 23:22:36 CEST 2013 x86_64 GNU/Linux
 # Linux 3.12.1-3-ARCH
 # Linux 3.8.0-34-generic #49~precise1-Ubuntu SMP Wed Nov 13 18:08:04 UTC 2013 i686 i686 i386 GNU/Linux
@@ -63083,13 +63224,16 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux Kernel 4.2.2-1
 # Linux 4.4.0-12-generic #28-Ubuntu SMP Wed Mar 9 00:33:55 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
 # Linux 4.5.0-040500-generic #201603140130 SMP Mon Mar 14 05:32:22 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
-# Linux newlisto.exigent.com 4.6.2-1-ARCH #1 SMP PREEMPT Wed Jun 8 08:40:59 CEST 2016 x86_64 GNU/Linux
-Fingerprint Linux 3.8 - 4.6
+# Linux 4.6.2-1-ARCH #1 SMP PREEMPT Wed Jun 8 08:40:59 CEST 2016 x86_64 GNU/Linux
+# Linux 4.8.0 #1 SMP Mon Oct 3 20:15:43 JST 2016 x86_64 x86_64 x86_64 GNU/Linux
+# Linux 4.8.13-1-ARCH #1 SMP PREEMPT Fri Dec 9 07:24:34 CET 2016 x86_64 GNU/Linux
+# Linux cpc 4.9.3 #1 SMP Fri Jan 13 16:02:58 JST 2017 x86_64 x86_64 x86_64 GNU/Linux
+Fingerprint Linux 3.8 - 4.9
 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=F3-10B%GCD=1-6%ISR=FA-111%TI=Z%CI=I|RD%II=I%TS=8|A)
+SEQ(SP=F3-10B%GCD=1-6%ISR=F9-111%TI=Z%CI=I|RD%II=I%TS=8|A)
 OPS(O1=MFFD7ST11NW5|MFFD7ST11NW6|MFFD7ST11NW7|MFFD7ST11NW8|MFFD7ST11NW9|MFFD7ST11NWA%O2=MFFD7ST11NW5|MFFD7ST11NW6|MFFD7ST11NW7|MFFD7ST11NW8|MFFD7ST11NW9|MFFD7ST11NWA%O3=MFFD7NNT11NW5|MFFD7NNT11NW6|MFFD7NNT11NW7|MFFD7NNT11NW8|MFFD7NNT11NW9|MFFD7NNT11NWA%O4=MFFD7ST11NW5|MFFD7ST11NW6|MFFD7ST11NW7|MFFD7ST11NW8|MFFD7ST11NW9|MFFD7ST11NWA%O5=MFFD7ST11NW5|MFFD7ST11NW6|MFFD7ST11NW7|MFFD7ST11NW8|MFFD7ST11NW9|MFFD7ST11NWA%O6=MFFD7ST11)
 WIN(W1=AAAA%W2=AAAA%W3=AAAA%W4=AAAA%W5=AAAA%W6=AAAA)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=AAAA%O=MFFD7NNSNW5|MFFD7NNSNW6|MFFD7NNSNW7|MFFD7NNSNW8|MFFD7NNSNW9|MFFD7NNSNWA%CC=Y%Q=)
@@ -63607,15 +63751,17 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 3.18.20 #1 Fri Sep 4 21:55:57 CEST 2015 mips GNU/Linux
 # Linux 3.18.20 (buildbot@builder1) (gcc version 4.8.3 (OpenWrt/Linaro GCC 4.8-2014.04 r46450) ) #1 Fri Sep 4 21:55:57 CEST 2015
 # Linux 4.1.13 #1 Sun Dec 27 17:57:31 CET 2015 mips GNU/Linux
+# OpenWRT CHAOS CALMER (15.05.1, r48532)
+# OpenWrt Chaos Calmer 15.05.1 / LuCI 15.05-188-g87e9837 Release (git-16.018.33482-3201903), Linux 3.18.23
 Fingerprint OpenWrt Chaos Calmer 15.05 (Linux 3.18) or Designated Driver (Linux 4.1)
 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=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)
+OPS(O1=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O2=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O3=M5B4NNT11NW2|M5B4NNT11NW3|M5B4NNT11NW4|M5B4NNT11NW5|M5B4NNT11NW6|M5B4NNT11NW7%O4=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O5=M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%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=)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW2|M5B4NNSNW3|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|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=N)
@@ -63755,6 +63901,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)
 
+# Linux 4.10.0-041000-lowlatency #201702191831 SMP PREEMPT Sun Feb 19 23:36:31 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux
+Fingerprint Linux 4.10
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4.10 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=101-10B%TI=Z%CI=I%II=I%TS=22)
+OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%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=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)
+
+# Linux 4.10.1-1-MANJARO #1 SMP PREEMPT Sun Feb 26 15:19:27 UTC 2017 x86_64 GNU/Linux
+Fingerprint Linux 4.10
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4.10 auto
+SEQ(SP=FA-104%GCD=1-6%ISR=107-111%TI=Z%CI=I%II=I%TS=21)
+OPS(O1=MFFD7ST11NW7%O2=MFFD7ST11NW7%O3=MFFD7NNT11NW7%O4=MFFD7ST11NW7%O5=MFFD7ST11NW7%O6=MFFD7ST11)
+WIN(W1=AAAA%W2=AAAA%W3=AAAA%W4=AAAA%W5=AAAA%W6=AAAA)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=AAAA%O=MFFD7NNSNW7%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)
+
 # CoreOS stable (835.8.0) (Linux 4.2.2)
 Fingerprint Linux 4.2
 Class Linux | Linux | 4.X | general purpose
@@ -65214,6 +65396,7 @@ U1(DF=N%T=FFB1-FFBB%TG=FF%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FFB1-FFBB%TG=FF%CD=Z)
 
 # Windows 10, DC=D
+# Windows 10 1607
 Fingerprint Microsoft Windows 10
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
@@ -65285,6 +65468,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(R=N)
 
+# Localhost, but M5B4
+# Version 1511 OS Build 10586.545
+# Windows 10 Home 1607
+# windows 10 Education 1607
+# # Version 1607 (Build 14393.693)
+Fingerprint Microsoft Windows 10 10586 - 14393
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=F5-109%GCD=1-6%ISR=102-110%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=)
+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)
+
 # Localhost with Npcap
 # Version 1511 (OS Build 10586.494)
 Fingerprint Microsoft Windows 10 1511
@@ -65304,15 +65509,14 @@ 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)
 
-# Localhost, but M5B4
-# Version 1511 OS Build 10586.545
-Fingerprint Microsoft Windows 10 1511
+# 1607
+Fingerprint Microsoft Windows 10 1607
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=FB-105%GCD=1-6%ISR=102-10C%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+SEQ(SP=FE-108%GCD=1-6%ISR=102-10C%TI=I%CI=I%II=I%TS=A)
+OPS(O1=MFFD7ST11%O2=MFFD7ST11%O3=MFFD7NNT11%O4=MFFD7ST11%O5=MFFD7ST11%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=M5B4NW8NNS%CC=N%Q=)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=MFFD7NNS%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=)
@@ -65329,7 +65533,8 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 # 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
+# Version 1067 (OS Build 14393.222)
+Fingerprint Microsoft Windows 10 build 10074 - 14393
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
 SEQ(SP=F7-10D%GCD=1-6%ISR=F9-113%TI=I%CI=I|RD%II=I%SS=S%TS=A)
@@ -65400,6 +65605,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)
 
+# Version 1511 (OS Build 10586.164)
+Fingerprint Microsoft Windows 10 build 10586
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5ACNW8ST11%O2=M5ACNW8ST11%O3=M5ACNW8NNT11%O4=M5ACNW8ST11%O5=M5ACNW8ST11%O6=M5ACST11)
+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=M5ACNW8NNS%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=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Version 1511 (OS Compilation 10586.318)
 # Windows 10 Pro Version 1607 (OS Build 14393.187)
 Fingerprint Microsoft Windows 10 build 10586 - 14393
@@ -65419,6 +65642,96 @@ 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)
 
+# Microsoft Windows Version 1607 (OS Build 14393.321)
+Fingerprint Microsoft Windows 10 build 14393
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=100-10A%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=)
+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=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 Version 1607 (OS Build 14393.576)
+Fingerprint Microsoft Windows 10 build 14393
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=101-10B%TI=I%CI=I%II=I%SS=S%TS=A)
+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=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)
+
+# Version 1607 (OS Build 14393.693)
+Fingerprint Microsoft Windows 10 build 14393
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=A)
+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=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)
+
+# Version 1607 (build 14393.693)
+Fingerprint Microsoft Windows 10 build 14393
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=106-110%TI=I%TS=A)
+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=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=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+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)
+
+# Version 1607 (OS Build 15031.0)
+Fingerprint Microsoft Windows 10 build 15031
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%TS=A)
+OPS(O1=MFFD7NW8ST11%O2=MFFD7NW8ST11%O3=MFFD7NW8NNT11%O4=MFFD7NW8ST11%O5=MFFD7NW8ST11%O6=MFFD7ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFDC)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%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 10 Enterprise
 # Version 1511
 Fingerprint Microsoft Windows 10 build 10586
@@ -82015,10 +82328,11 @@ 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.
+# Data ONTAP 8.2.x
 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)
+SEQ(SP=FD-109%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=)
@@ -86376,10 +86690,11 @@ U1(DF=N%T=F9-103%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
 # OpenBSD 6.0 GENERIC#0 i386
+# OpenBSD 6.0 GENERIC.MP#13 (TS=22)
 Fingerprint OpenBSD 6.0
 Class OpenBSD | OpenBSD | 6.X | general purpose
 CPE cpe:/o:openbsd:openbsd:6.0 auto
-SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=RD%CI=RI%II=RI%TS=21)
+SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=RD%CI=RI%II=RI%TS=21|22)
 OPS(O1=M5A0NNSNW3NNT11%O2=M5A0NNSNW3NNT11%O3=M5A0NW3NNT11%O4=M5A0NNSNW3NNT11%O5=M5A0NNSNW3NNT11%O6=M5A0NNSNNT11)
 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=M5A0NNSNW3%CC=N%Q=)
@@ -86411,6 +86726,24 @@ 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)
+
 # SNAP PAC Ethernet Brain 2
 Fingerprint Opto 22 SNAP-PAC-EB2 I/O controller
 Class Opto 22 | embedded || specialized
@@ -93755,6 +94088,23 @@ T7(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=19-23%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=19-23%TG=20%CD=S)
 
+# Vivint control panel
+Fingerprint Suga embedded WiFi module
+Class Suga | embedded || specialized
+SEQ(SP=B4-BE%GCD=1-6%ISR=C7-D1%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW5%O2=M5B4ST11NW5%O3=M5B4NNT11NW5%O4=M5B4ST11NW5%O5=M5B4ST11NW5%O6=M5B4ST11)
+WIN(W1=10F8%W2=10F8%W3=10F8%W4=10F8%W5=10F8%W6=10F8)
+ECN(R=Y%DF=Y%T=3A-44%TG=40%W=111C%O=M5B4NNSNW5%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=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%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=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)
+
 # ILOM for T2000 Server (T2000 had ALOM, not ILOM --Ed.)
 Fingerprint Sun Advanced Lights-Out Manager
 Class Sun | embedded || remote management