diff --git a/nmap-os-db b/nmap-os-db
index a77753d96..ee53684da 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -6302,7 +6302,7 @@ 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
-Fingerprint Apple Mac OS X 10.7.0 (Lion) - 10.10 (Yosemite) or iOS 4.1 - 9 (Darwin 10.0.0 - 15.0.0)
+Fingerprint Apple Mac OS X 10.7.0 (Lion) - 10.11 (El Capitan) or iOS 4.1 - 9 (Darwin 10.0.0 - 15.0.0)
 Class Apple | Mac OS X | 10.7.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.7
 Class Apple | Mac OS X | 10.8.X | general purpose
@@ -7214,9 +7214,12 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
 # Airport Extreme 802.11ac wifi-router, OS version 7.7.3
-Fingerprint Apple AirPort Extreme WAP (version 7.7.3)
+# NetBSD 7.99.21
+Fingerprint Apple AirPort Extreme WAP (version 7.7.3) or NetBSD 7.99
 Class Apple | NetBSD || general purpose
 CPE cpe:/o:apple:netbsd auto
+Class NetBSD | NetBSD | 7.X | general purpose
+CPE cpe:/o:netbsd:netbsd:7.99 auto
 SEQ(SP=C5-CF%GCD=1-6%ISR=D6-E0%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)
@@ -11760,9 +11763,12 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-Fingerprint Canon imageRUNNER C3200 printer
+# VxWorks
+Fingerprint Canon imageRUNNER C3200 printer or Polycom SoundStation IP 4000 VoIP phone
 Class Canon | embedded || printer
 CPE cpe:/h:canon:imagerunner_c3200
+Class Polycom | embedded || VoIP phone
+CPE cpe:/h:polycom:soundstation_ip_4000 auto
 SEQ(SP=16-20%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=9B-A5%TI=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)
@@ -21340,6 +21346,7 @@ IE(DFI=N%T=6F%TG=80%CD=Z)
 
 # Regular NET+OS from Digi. Digi based its NET+OS on ThreadX and this NET+OS can be changed/reprogrammed.
 # NetOS 7.x
+# NET+OS 7.5.0.14
 Fingerprint Digi NET+OS 7
 Class Digi | NET+OS | 7 | specialized
 CPE cpe:/o:digi:net_os:7 auto
@@ -42659,29 +42666,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)
 
-# Linux 2.6.19.2 OpenWRT Kamikaze r6813 (mips, build #1 Mon Apr 2 05:59:27 BST 2007, Fon 2100A/B/C (ACCTON MR3201A)), Linux OpenWRT-kamikaze 2.6.17 #1 Fri Dec 1 02:56:41 CET 2006 mips unknown
-# Linux OpenWrt 2.6.21.5 #2 Sun Sep 30 20:16:16 CEST 2007 mips unknown
-# Linux 2.6.21.6 #1 Fri Dec 28 11:04:49 UTC 2007 armv5teb unknown / OpenWrt KAMIKAZE (7.09)
-# Linux OpenWrt 2.6.32.8 #1 Sat Feb 20 11:01:32 UTC 2010 mips GNU/Linux
-# OpenWrt Backfire (10.03, r20728) running Linux 2.6.32.10
-# Linux 2.6.32.10 #20 Tue Apr 6 15:53:48 CEST 2010 mips GNU/Linux - OpenWRT 10.03 "Backfire"
-Fingerprint OpenWrt Kamikaze - Backfire 10.03 (Linux 2.6.19 - 2.6.32)
-Class Linux | Linux | 2.6.X | broadband router
-CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=B6-D0%GCD=1-6%ISR=BB-D7%TI=Z%CI=Z%II=I%TS=U)
-OPS(O1=M5B4NNSNW1%O2=M5B4NNSNW1%O3=M5B4NW1%O4=M5B4NNSNW1%O5=M5B4NNSNW1%O6=M5B4NNS)
-WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%S=O%A=S+%F=AS%O=M5B4NNSNW1%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=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 OpenWrt 2.6.25.16 #1 Tue Aug 26 22:49:41 CEST 2008 mips unknown; OpenWrt KAMIKAZE (bleeding edge, r12394)
 # OpenWrt Kamikaze 8.09 RC1
 # Linux ag241 2.6.26.5 #1 Mon Jan 5 05:57:36 CET 2009 mips unknown - OpenWRT KAMIKAZE (8.09, r14511)
@@ -54652,6 +54636,29 @@ T7(R=Y%DF=Y%T=41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=41%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=41%TG=40%CD=S)
 
+# Linux 2.6.19.2 OpenWRT Kamikaze r6813 (mips, build #1 Mon Apr 2 05:59:27 BST 2007, Fon 2100A/B/C (ACCTON MR3201A)), Linux OpenWRT-kamikaze 2.6.17 #1 Fri Dec 1 02:56:41 CET 2006 mips unknown
+# Linux OpenWrt 2.6.21.5 #2 Sun Sep 30 20:16:16 CEST 2007 mips unknown
+# Linux 2.6.21.6 #1 Fri Dec 28 11:04:49 UTC 2007 armv5teb unknown / OpenWrt KAMIKAZE (7.09)
+# Linux OpenWrt 2.6.32.8 #1 Sat Feb 20 11:01:32 UTC 2010 mips GNU/Linux
+# OpenWrt Backfire (10.03, r20728) running Linux 2.6.32.10
+# Linux 2.6.32.10 #20 Tue Apr 6 15:53:48 CEST 2010 mips GNU/Linux - OpenWRT 10.03 "Backfire"
+Fingerprint OpenWrt Kamikaze - Backfire or SuperMicro BMC (Linux 2.6.19 - 2.6.32)
+Class Linux | Linux | 2.6.X | general purpose
+CPE cpe:/o:linux:linux_kernel:2.6 auto
+SEQ(SP=B6-D0%GCD=1-6%ISR=BB-D7%TI=Z%CI=Z%II=I%TS=U)
+OPS(O1=M5B4NNSNW1%O2=M5B4NNSNW1%O3=M5B4NW1%O4=M5B4NNSNW1%O5=M5B4NNSNW1%O6=M5B4NNS)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%S=O%A=S+%F=AS%O=M5B4NNSNW1%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=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 Enterprise Linux 6
 Fingerprint Oracle Enterprise Linux 6 (Linux 2.6.32)
 Class Linux | Linux | 2.6.X | general purpose
@@ -60731,7 +60738,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 3.15.7 #1 SMP Mon Jul 28 19:47:57 EAT 2014 x86_64 x86_64 x86_64 GNU/Linux/Ubuntu 14.04
 # Linux 4.0.0-rc7 #1 SMP PREEMPT Tue Apr 7 23:18:51 CEST 2015 x86_64 GNU/Linux
 # Linux 4.1.1-040101-generic #201507030635 SMP Fri Jul 3 10:38:27 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux
-Fingerprint Linux 3.8 - 4.1
+# Linux Kernel 4.2.2-1
+Fingerprint Linux 3.8 - 4.2
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
 Class Linux | Linux | 4.X | general purpose
@@ -67215,24 +67223,6 @@ T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# Windows Server 2008R2 Enterprise
-Fingerprint Microsoft Windows Server 2008 R2
-Class Microsoft | Windows | 2008 | general purpose
-CPE cpe:/o:microsoft:windows_server_2008:r2
-SEQ(SP=101-10B%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=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=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Windows Server 2008 R2 Version 6.1 (Build 7600)
 Fingerprint Microsoft Windows Server 2008 R2
 Class Microsoft | Windows | 2008 | general purpose
@@ -67307,6 +67297,26 @@ 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 2008R2 Enterprise
+Fingerprint Microsoft Windows Server 2008 R2 or Windows 8.1
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008:r2
+Class Microsoft | Windows | 8.1 | general purpose
+CPE cpe:/o:microsoft:windows_8.1 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=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=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Windows Server 2008 R2 Enterprise -  Version 6.1 (Build 7601: Service Pack 1)
 Fingerprint Microsoft Windows Server 2008 R2 SP1
 Class Microsoft | Windows | 2008 | general purpose
@@ -67767,7 +67777,8 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
 # 6.0.6002 Service Pack 2 Build 6002
 # Xbox One 6.2.12825.0 (xb_rel_1505.150507-2219) fre
-Fingerprint Microsoft Windows Server 2008 SP2 or Windows 10 Tech Preview or Xbox One
+# Windows 10 Enterprise
+Fingerprint Microsoft Windows Server 2008 SP2 or Windows 10 or Xbox One
 Class Microsoft | Windows | 2008 | general purpose
 CPE cpe:/o:microsoft:windows_server_2008::sp2
 Class Microsoft | Windows | 10 | general purpose