diff --git a/nmap-os-db b/nmap-os-db
index ba684b81e..26c09b63a 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -13378,27 +13378,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%RD=0)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# HP ProCurve Switch 1810G-8 running P.1.17 version
-# Cisco SG 200-08 8-Port Gigabit Smart Switch
-Fingerprint Cisco SG 200-08 or HP ProCurve 1810G switch
-Class Cisco | embedded || switch
-CPE cpe:/h:cisco:sg_200-08
-Class HP | embedded || switch
-CPE cpe:/h:hp:procurve_switch_1810g
-SEQ(SP=F5-109%GCD=1-6%ISR=F7-111%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=10F8%W2=1044%W3=112C%W4=1194%W5=1060%W6=10CD)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=111C%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # Netgear GS724TP (PoE 24port gigabit switch)
 # Dell PowerConnect 2748, Firmware Version 1.0.0.33, Boot Version 1.0.0.05
 # Linksys SLM224P switch, Boot Version   1.0.4, Firmware Version   1.0.1
@@ -15199,29 +15178,6 @@ T7(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=100%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=100%TG=FF%CD=S)
 
-# Cisco IOS Software, C831 Software (C831-K9O3SY6-M), Version 12.4(15)T10
-# Cisco IOS 12.4(25b) on a 1760 router
-Fingerprint Cisco 831 switch or 1760 router (IOS 12.4)
-Class Cisco | IOS | 12.X | router
-CPE cpe:/h:cisco:1760_router
-CPE cpe:/o:cisco:ios:12.4
-Class Cisco | IOS | 12.X | switch
-CPE cpe:/h:cisco:831_switch
-CPE cpe:/o:cisco:ios:12.4
-SEQ(SP=F8-108%GCD=1-6%ISR=100-112%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)
-ECN(R=Y%DF=N%T=100%TG=FF%W=1020%O=M218%CC=N%Q=)
-T1(R=Y%DF=N%T=100%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=100%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=100%TG=FF%CD=S)
-
 # Cisco IOS Software, C836 Software (C836-K9O3S8Y6-M), Version 12.4(23), RELEASE SOFTWARE (fc1), ROM: System Bootstrap, Version 12.2(11r)YV, RELEASE SOFTWARE (fc1)
 # Cisco IOS Software, 1841 Software (C1841-ADVENTERPRISEK9-M), Version 12.4(24)T, RELEASE SOFTWARE (fc1)
 # Cisco IOS Software, 2800 Software (C2800NM-ADVENTERPRISEK9-M), Version 12.4(23), RELEASE SOFTWARE (fc1)
@@ -15506,6 +15462,31 @@ T7(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A|O%A=O|S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FB-105%TG=FF%CD=S)
 
+# Cisco IOS Software Product/Model Number: AIR-AP1262N-E-K9 System Software Version: 12.4(25d)JA1
+# Cisco IAD2430 (R527x) processor (rev 4.1) Cisco IOS Software, 2400 Software (C2430-I6S-M) Version 12.4(15)T10, Release Software (fc3)
+# Cisco Wireless Access Point (AIR-LAP1142N-A-K9 V01)
+# Cisco IOS Software, C831 Software (C831-K9O3SY6-M), Version 12.4(15)T10
+# Cisco IOS 12.4(25b) on a 1760 router
+# IOS-XE 15.3
+Fingerprint Cisco IOS 12.4 or IOS-XE 15.3
+Class Cisco | IOS | 12.X | router
+CPE cpe:/o:cisco:ios:12.4 auto
+Class Cisco | IOS-XE | 15.X | router
+CPE cpe:/o:cisco:ios_xe:15.3 auto
+SEQ(SP=F8-10B%GCD=1-6%ISR=100-112%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)
+ECN(R=Y%DF=N%T=F7-101%TG=FF%W=1020%O=M218%CC=N)
+T1(R=Y%DF=N%T=F7-101%TG=FF%S=O%A=S+%F=AS%RD=0)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=Z%F=R%RD=0)
+T5(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=S+%F=AR%RD=0)
+T6(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=Z%F=R%RD=0)
+T7(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=S%F=AR%RD=0)
+U1(DF=N%T=F7-101%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=F7-101%TG=FF%CD=S)
+
 # Cisco DOCSIS CMTS running IOS 12.1  (this is a cable modem termination server)
 # IOS (tm) 7200 Software (UBR7200-IK1S-M), Version 12.1(8.5)EC, EARLY DEPLOYMENT MAINTENANCE INTERIM SOFTWARE
 Fingerprint Cisco DOCSIS cable modem termination server (IOS 12.1)
@@ -16715,29 +16696,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# Cisco IOS Software Product/Model Number: AIR-AP1262N-E-K9 System Software Version: 12.4(25d)JA1
-# Cisco IAD2430 (R527x) processor (rev 4.1) Cisco IOS Software, 2400 Software (C2430-I6S-M) Version 12.4(15)T10, Release Software (fc3)
-# Cisco Wireless Access Point (AIR-LAP1142N-A-K9 V01)
-Fingerprint Cisco Aironet 1140 or 1262 WAP, or IAD 2430 router (IOS 12.4)
-Class Cisco | IOS | 12.X | WAP
-CPE cpe:/h:cisco:aironet_ap1140
-CPE cpe:/h:cisco:aironet_ap1262
-Class Cisco | IOS | 12.X | router
-CPE cpe:/h:cisco:iad_2430
-SEQ(SP=FB-10B%GCD=1-6%ISR=102-110%TI=RD%CI=RD%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)
-ECN(R=Y%DF=N%T=F7-101%TG=FF%W=1020%O=M218%CC=N)
-T1(R=Y%DF=N%T=F7-101%TG=FF%S=O%A=S+%F=AS%RD=0)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=Z%F=R%RD=0)
-T5(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=S+%F=AR%RD=0)
-T6(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=Z%F=R%RD=0)
-T7(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=S%F=AR%RD=0)
-U1(DF=N%T=F7-101%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=F7-101%TG=FF%CD=S)
-
 # Cisco AIR-AP1141N-E-K9 running IOS 12.4(21a)JA1
 # AIR-CAP3602I-E-K9, Cisco IOS Software, C3600 Software (AP3G2-K9W7-M), Version 15.3(3)JAB, RELEASE SOFTWARE (fc1)
 Fingerprint Cisco Aironet 1141N (IOS 12.4) or 3602I (IOS 15.3) WAP
@@ -22055,6 +22013,31 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# HP ProCurve Switch 1810G-8 running P.1.17 version
+# Cisco SG 200-08 8-Port Gigabit Smart Switch
+# Netgear GS110TP, firmware 5.4.2.19
+Fingerprint Cisco 200-series, HP ProCurve 1810G, or Netgear GS110TP switch (eCos 2.0)
+Class eCosCentric | eCos | 2.0 | switch
+CPE cpe:/o:ecoscentric:ecos:2.0 auto
+Class Cisco | embedded || switch
+Class HP | embedded || switch
+CPE cpe:/h:hp:procurve_switch_1810g
+Class Netgear | embedded || switch
+CPE cpe:/h:netgear:gs110tp auto
+SEQ(SP=F5-109%GCD=1-6%ISR=F7-111%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=10F8%W2=1044%W3=112C%W4=1194%W5=1060%W6=10CD)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=111C%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # SB6183-9.2.0.0-GA-03-29-NOSH
 Fingerprint Arris SB6183 cable modem (eCos 2.0)
 Class eCosCentric | eCos | 2.X | broadband router
@@ -30042,7 +30025,8 @@ IE(DFI=N%T=FA-104%TG=FF%CD=S)
 # HP LaserJet 5100 Series printer (J7934A), Firmware Version:  V.28.06
 # HP Laserjet 3330
 # hp color LaserJet 5550
-Fingerprint HP LaserJet 3330/4050/4200/4600/5100/5550 printer
+# HP Color LaserJet 9500HDN
+Fingerprint HP LaserJet 3330/4050/4200/4600/5100/5550/9500 printer
 Class HP | embedded || printer
 SEQ(SP=95-9F%GCD=1-6%ISR=9B-A5%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -58990,6 +58974,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)
 
+# 3.12.6-300.fc20.i686 #1 SMP Mon Dec 23 17:14:46 UTC 2013 i686 i686 i386 GNU/Linux
+# Linux 3.10.0-327.4.5.el7.x86_64 #1 SMP Mon Jan 25 22:07:14 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux (CentOS Linux release 7.2.1511 (Core))
+Fingerprint Linux 3.10 - 3.12
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=10A-114%TI=Z%II=I%TS=A)
+OPS(O1=M546ST11NW7|M5B4ST11NW6%O2=M546ST11NW7|M5B4ST11NW6%O3=M546NNT11NW7|M5B4NNT11NW6%O4=M546ST11NW7|M5B4ST11NW6%O5=M546ST11NW7|M5B4ST11NW6%O6=M546ST11|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=M546NNSNW7|M5B4NNSNW6%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Localhost
 # Linux 3.12.4-1-ARCH #1 PREEMPT Tue Dec 10 07:14:45 CST 2013 armv6l GNU/Linux ***** (Raspberry Pi Arch Linux)
 # Linux 3.10.24+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #614 PREEMPT Thu Dec 19 20:38:42 GMT 2013
@@ -59261,24 +59264,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)
 
-# 3.12.6-300.fc20.i686 #1 SMP Mon Dec 23 17:14:46 UTC 2013 i686 i686 i386 GNU/Linux
-Fingerprint Linux 3.12
-Class Linux | Linux | 3.X | general purpose
-CPE cpe:/o:linux:linux_kernel:3.12 auto
-SEQ(SP=FD-107%GCD=1-6%ISR=10A-114%TI=Z%II=I%TS=A)
-OPS(O1=M546ST11NW7%O2=M546ST11NW7%O3=M546NNT11NW7%O4=M546ST11NW7%O5=M546ST11NW7%O6=M546ST11)
-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=M546NNSNW7%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 3.12.26+ #707 PREEMPT Sat Aug 30 17:39:19 BST 2014 armv6l GNU/Linux
 Fingerprint Linux 3.12
 Class Linux | Linux | 3.X | general purpose
@@ -59723,6 +59708,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(R=N)
 
+# Linux 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt20-1+deb8u3 (2016-01-17) x86_64 GNU/Linux
+Fingerprint Linux 3.16
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3.16 auto
+SEQ(CI=I|RD%II=I)
+OPS(R=N)
+WIN(R=N)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW9%CC=Y%Q=)
+T1(R=N)
+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.18.13-2-ARCH #1 SMP PREEMPT Mon May 18 20:19:37 MDT 2015 armv7l GNU/Linux
 # Linux 3.19.0-26-generic #28-Ubuntu SMP Tue Aug 11 14:16:45 UTC 2015 i686 i686 i686 GNU/Linux
 # Linux 3.16.0-navtech-epu #4 SMP PREEMPT Wed Dec 2 13:16:34 GMT 2015 armv7l armv7l armv7l GNU/Linux
@@ -62278,6 +62281,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)
 
+# Linux 4.1.6-3.gd867e86-desktop #1 SMP PREEMPT Fri Aug 28 10:59:34 UTC 2015 (d867e86) x86_64 x86_64 x86_64 GNU/Linux
+# (Looks more like 3.0 - 3.10. Delete if troublesome --ed.)
+Fingerprint Linux 4.1
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4.1 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=10A-114%TI=Z%CI=I|RD%II=I%TS=8)
+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)
+
 # CoreOS stable (835.8.0) (Linux 4.2.2)
 Fingerprint Linux 4.2
 Class Linux | Linux | 4.X | general purpose
@@ -65784,6 +65806,24 @@ T7(R=N)
 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)
 
+# Microsoft Windows 2003
+Fingerprint Microsoft Windows Server 2003
+Class Microsoft | Windows | 2003 | general purpose
+CPE cpe:/o:microsoft:windows_server_2003 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=106-110%TI=RD%II=I%TS=0)
+OPS(O1=M564NW0NNT00NNS%O2=M564NW0NNT00NNS%O3=M564NW0NNT00%O4=M564NW0NNT00NNS%O5=M564NW0NNT00NNS%O6=M564NNT00NNS)
+WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M564NW0NNS%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=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+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)
+
 # Windows Server 2003 R2 3790 Service Pack 2
 Fingerprint Microsoft Windows Server 2003 2
 Class Microsoft | Windows | 2003 | general purpose
@@ -69075,6 +69115,24 @@ 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 2012 pro
+Fingerprint Microsoft Windows Server 2012 Professional
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012 auto
+SEQ(SP=F4-FE%GCD=1-6%ISR=FA-104%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=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)
+
 # Windows Server 2012 R2 Datacenter Edition on Windows Azure
 Fingerprint Microsoft Windows Server 2012 R2
 Class Microsoft | Windows | 2012 | general purpose
@@ -70134,30 +70192,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)
 
-# Microsoft Windows 6.1 7600
-# Windows Server 2008 Enterprise
-# Windows 7 Professional, SP1, 32bit
-# version 6.1 (build 7601: service pack 1)
-Fingerprint Microsoft Windows 7 SP0 - SP1, or Windows Server 2008
-Class Microsoft | Windows | 7 | general purpose
-CPE cpe:/o:microsoft:windows_7::-
-CPE cpe:/o:microsoft:windows_7::sp1
-Class Microsoft | Windows | 2008 | general purpose
-CPE cpe:/o:microsoft:windows_server_2008 auto
-SEQ(SP=F4-10C%GCD=1-6%ISR=101-10F%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B8NW8ST11%O2=M5B8NW8ST11%O3=M5B8NW8NNT11%O4=M5B8NW8ST11%O5=M5B8NW8ST11%O6=M5B8ST11)
-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=M5B8NW8NNS%CC=N)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%RD=0)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%RD=0)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%RD=0)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%RD=0)
-T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
-U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # 6.0.6001
 # version 6.1 (build 7600)
 # 6.1.7601
@@ -70186,6 +70220,32 @@ 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 6.1 7600
+# Windows Server 2008 Enterprise
+# Windows 7 Professional, SP1, 32bit
+# version 6.1 (build 7601: service pack 1)
+Fingerprint Microsoft Windows 7 SP0 - SP1, Windows Server 2008, or Windows Embedded Compact 7
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7::-
+CPE cpe:/o:microsoft:windows_7::sp1
+Class Microsoft | Windows | 2008 | general purpose
+CPE cpe:/o:microsoft:windows_server_2008 auto
+Class Microsoft | Windows | Embedded Compact 7 | general purpose
+CPE cpe:/o:microsoft:windows_embedded_compact_7
+SEQ(SP=F4-10C%GCD=1-6%ISR=101-10F%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B8NW8ST11%O2=M5B8NW8ST11%O3=M5B8NW8NNT11%O4=M5B8NW8ST11%O5=M5B8NW8ST11%O6=M5B8ST11)
+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=M5B8NW8NNS%CC=N)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%RD=0)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%RD=0)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%RD=0)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%RD=0)
+T7(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
+U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # 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
@@ -83712,7 +83772,8 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 # OpenBSD 5.0 GENERIC#43 i386
 # OpenBSD 5.5 GENERIC#264 i386
 # OpenBSD 5.7 GENERIC.MP#0 amd64
-Fingerprint OpenBSD 5.0 - 5.7
+# OpenBSD 5.8
+Fingerprint OpenBSD 5.0 - 5.8
 Class OpenBSD | OpenBSD | 5.X | general purpose
 CPE cpe:/o:openbsd:openbsd:5 auto
 SEQ(SP=F8-10A%GCD=1-6%ISR=FA-114%TI=RD%CI=RI%II=RI%TS=20|21|22)