diff --git a/nmap-os-db b/nmap-os-db
index 7d20bac17..e1b1143ef 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -7708,24 +7708,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 3.1.10-g52027f9 #1 SMP PREEMPT Thu Jun 28 16:19:26 PDT 2012 armv71 GNU/Linux, Asus Nexus 7 Android Tablet
-Fingerprint Linux 3.1
-Class Asus | Linux | 3.X | general purpose
-CPE cpe:/o:asus:linux_kernel:3 auto
-SEQ(SP=102-10C%GCD=1-6%ISR=108-112%TI=Z%CI=Z%II=I%TS=6|7)
-OPS(O1=M566ST11NW6%O2=M566ST11NW6%O3=M566NNT11NW6%O4=M566ST11NW6%O5=M566ST11NW6%O6=M566ST11)
-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=M566NNSNW6%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=3890%S=O%A=S+%F=AS%O=M566ST11NW6%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)
-
 # RT-AC66U
 Fingerprint Asus RT-AC66U WAP
 Class Asus | Linux || WAP
@@ -16871,10 +16853,13 @@ 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)
 
 # Aironet 1250 series running IOS 12.4
-Fingerprint Cisco Aironet 1250 WAP (IOS 12.4)
+# IOSXE on a ASR1001X router
+Fingerprint Cisco Aironet 1250 WAP (IOS 12.4) or IOS XE
 Class Cisco | IOS | 12.X | WAP
 CPE cpe:/h:cisco:aironet_ap1250
 CPE cpe:/o:cisco:ios:12.4
+Class Cisco | IOS XE || router
+CPE cpe:/o:cisco:ios_xe auto
 SEQ(SP=FB-105%GCD=1-6%ISR=FE-10E%TI=RD%CI=RD|RI%II=RI%TS=U)
 OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M109)
 WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
@@ -23948,7 +23933,7 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 Fingerprint Fortinet FortiGate 100D firewall
 Class Fortinet | embedded || firewall
 CPE cpe:/h:fortinet:fortigate_100d auto
-SEQ(SP=FA-104%GCD=1-6%ISR=102-10C%TI=RD%TS=7)
+SEQ(SP=FA-10A%GCD=1-6%ISR=102-10C%TI=BI|RD%TS=7)
 OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=N)
@@ -54497,25 +54482,6 @@ T7(R=Y%DF=Y%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 3.1.10-1.13-desktop #1 SMP PREEMPT Tue Jun 12 13:11:31 UTC 2012 (44a489e) x86_64 x86_64 x86_64 GNU/Linux
-# Linux 3.0.34-0.7-default #1 SMP Tue Jun 19 09:56:30 UTC 2012 (fbfc70c) x86_64 x86_64 x86_64 GNU/Linux
-Fingerprint Linux 3.0 - 3.1
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=102-10C%GCD=1-6%ISR=FF-109%TI=Z%CI=Z%II=I%TS=8|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=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=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-028stab045 #1 SMP Wed Oct 3 20:08:06 CEST 2007 x86_64 GNU/Linux / Debian GNU/Linux 4.0, patched kernel with the OpenVZ virtualization system
 Fingerprint OpenVZ Linux virtualization kernel (Linux 2.6.18-028stab045)
 Class Linux | Linux | 2.6.X | general purpose
@@ -55793,6 +55759,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)
 
+# Linux 3.1.10-1.13-desktop #1 SMP PREEMPT Tue Jun 12 13:11:31 UTC 2012 (44a489e) x86_64 x86_64 x86_64 GNU/Linux
+# Linux 3.0.34-0.7-default #1 SMP Tue Jun 19 09:56:30 UTC 2012 (fbfc70c) x86_64 x86_64 x86_64 GNU/Linux
+Fingerprint Linux 3.0 - 3.1
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=FF-109%TI=Z%CI=Z%II=I%TS=8|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=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=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.1.0-7.fc16.i686 #1 SMP Tue Nov 1 21:00:16 UTC 2011 i686 i686 i386 GNU/Linux
 # Linux 3.0.0-voyage #1 SMP PREEMPT Mon Oct 24 01:49:56 HKT 2011 i586 GNU/Linux
 Fingerprint Linux 3.0 - 3.1
@@ -55923,6 +55908,24 @@ 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)
 
+# Linux 3.1.10-g52027f9 #1 SMP PREEMPT Thu Jun 28 16:19:26 PDT 2012 armv71 GNU/Linux, Asus Nexus 7 Android Tablet
+Fingerprint Linux 3.1
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=108-112%TI=Z%CI=Z%II=I%TS=6|7)
+OPS(O1=M566ST11NW6%O2=M566ST11NW6%O3=M566NNT11NW6%O4=M566ST11NW6%O5=M566ST11NW6%O6=M566ST11)
+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=M566NNSNW6%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=3890%S=O%A=S+%F=AS%O=M566ST11NW6%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 3.1.0-1-686-pae #1 SMP Mon Nov 14 08:24:20 UTC 2011 i686 GNU/Linux debian wheezy/sid
 Fingerprint Linux 3.1
 Class Linux | Linux | 3.X | general purpose
@@ -64590,11 +64593,14 @@ 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.0.6002 Service Pack 2 Build 6002
-Fingerprint Microsoft Windows Server 2008 SP2 or Windows 10 Tech Preview
+# 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
 Class Microsoft | Windows | 2008 | general purpose
 CPE cpe:/o:microsoft:windows_server_2008::sp2
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
+Class Microsoft | embedded || media device
+CPE cpe:/h:microsoft:xbox_one
 SEQ(SP=D2-11B%GCD=1-6%ISR=F5-113%TI=I%CI=I%II=I%SS=O%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)
@@ -66544,6 +66550,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)
 
+# Symon SDA830 media player
+Fingerprint Microsoft Windows Embedded Standard 7
+Class Microsoft | Windows | 7 | specialized
+CPE cpe:/o:microsoft:windows_7 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=104-10E%II=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=N)
+T6(R=N)
+T7(R=N)
+U1(R=N)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # 6.2
 Fingerprint Microsoft Windows 8
 Class Microsoft | Windows | 8 | general purpose
@@ -77898,9 +77922,10 @@ IE(DFI=N%T=7B-85%TG=80%CD=S)
 
 # Novell Open Enterprise Server, NetWare 6.5, Support Pack 06
 # Novell NetWare 6.5
-Fingerprint Novell NetWare 6.5 Open Enterprise Server SP6
+# Netware 6.5 SP8
+Fingerprint Novell NetWare 6.5 Open Enterprise Server
 Class Novell | NetWare | 6.X | general purpose
-CPE cpe:/o:novell:netware:6.5:sp6
+CPE cpe:/o:novell:netware:6.5
 SEQ(SP=FE-10D%GCD=1-6%ISR=105-10F%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4W2NSNN%O2=M578W2NSNN%O3=M280W2N%O4=M5B4W2NSNN%O5=M218W2NSNN%O6=M109SNN)
 WIN(W1=1800%W2=1800%W3=1800%W4=1800%W5=1800%W6=1800)
@@ -78129,27 +78154,6 @@ T7(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S%F=ARF%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=1B-25%TG=20%CD=S)
 
-# OKI Network Printer OKI-C5600-340179
-# OKI printer, model C5650
-# OKI ES8460 MFP CU Version 04.70  PU Version 00.06.07  SIP Version 04.23
-# OKI ES3640a3
-# OKI B430dn
-Fingerprint Oki B430dn, C710, C5600, C5650, ES3640, or ES8460 printer
-Class Oki | embedded || printer
-SEQ(SP=F7-109%GCD=1-6%ISR=FF-111%TI=I%CI=I%II=I%SS=S%TS=5|6)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=3A-44%TG=40%W=8000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3A-44%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3A-44%TG=40%W=8000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3A-44%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=S%T=3A-44%TG=40%CD=S)
-
 # Oki Model number B4545
 Fingerprint Oki B4545 printer
 Class Oki | embedded || printer
@@ -78240,6 +78244,29 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# OKI Network Printer OKI-C5600-340179
+# OKI printer, model C5650
+# OKI ES8460 MFP CU Version 04.70  PU Version 00.06.07  SIP Version 04.23
+# OKI ES3640a3
+# OKI B430dn
+# Oki MC361
+# Oki B431
+Fingerprint Oki network printer
+Class Oki | embedded || printer
+SEQ(SP=F7-109%GCD=1-6%ISR=FF-111%TI=I%CI=I%II=I%SS=S%TS=5|6)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=Y%T=3A-44%TG=40%W=8000%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3A-44%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3A-44%TG=40%W=8000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3A-44%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3A-44%TG=40%CD=S)
+
 # Olympus Stylus SH-2 camera
 Fingerprint Olympus Stylus SH-2 camera
 Class Olympus | embedded || webcam