diff --git a/nmap-os-db b/nmap-os-db
index 9b88b7b99..f271ac114 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -22928,6 +22928,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=4210%RIPCK=I%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# EMC VNX OE for File
+Fingerprint EMC VNX OE for File 7
+Class EMC | VNX OE for File | 7.X | storage-misc
+CPE cpe:/o:emc:vnx_oe_for_file:7 auto
+SEQ(SP=FA-10A%GCD=1-6%ISR=108-112%CI=RI%II=I%TS=U)
+OPS(O1=M564NNS%O2=M564NNS%O3=M564%O4=M564NNS%O5=M564NNS%O6=M564NNS)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=FD-107%TG=FF%W=FFFF%O=M564NNS%CC=N%Q=)
+T1(R=Y%DF=N%T=FD-107%TG=FF%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=N)
+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=N)
+U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=I%RUCK=G%RUD=G)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
 # EMC VNX7500 running File-OE 7.1.76-4
 Fingerprint EMC VNX OE for File 7.1
 Class EMC | VNX OE for File | 7.X | storage-misc
@@ -23691,11 +23709,29 @@ T7(R=Y%DF=N%T=1A-24%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7C-86%TG=80%IPL=38%UN=0%RIPL=134%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=7C-86%TG=80%CD=S)
 
+# ExtremeXOS version 12.5.4.5 v1254b5
+Fingerprint Extreme Networks ExtremeXOS 12.5.4
+Class Extreme Networks | ExtremeXOS | 12.X | switch
+CPE cpe:/o:extremenetworks:extremexos:12.5.4 auto
+SEQ(SP=C6-E2%GCD=1-6%ISR=C9-E3%TI=Z%II=I%TS=7|8|9)
+OPS(O1=M5B4NNT11NW5%O2=M5B4NNT11NW5%O3=M5B4NNT11NW5%O4=M5B4NNT11NW5%O5=M5B4NNT11NW5%O6=M5B4NNT11)
+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=M5B4NW5%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)
+
 # Extreme Networks x250e-48p layer 3 switch, ExtremeXOS version 12.0.1.11
 # Extreme Networks Summit x350-48lt, ExtremeXOS version 12.0.3.16 v1203b16
 Fingerprint Extreme Networks x250e or x350 switch (ExtremeXOS 12.0.1 - 12.0.3)
 Class Extreme Networks | ExtremeXOS | 12.X | switch
-CPE cpe:/o:extremenetworks:extremexos:12 auto
+CPE cpe:/o:extremenetworks:extremexos:12.0
 SEQ(SP=C3-CD%GCD=1-6%ISR=C5-D3%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5B4NNT11NW0%O2=M5B4NNT11NW0%O3=M5B4NNT11NW0%O4=M5B4NNT11NW0%O5=M5B4NNT11NW0%O6=M5B4NNT11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
@@ -23710,6 +23746,29 @@ 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=FA-104%TG=FF%CD=S)
 
+# SysName: X450e-48p, Primary ver: 12.0.3.16, Secondary ver: 15.3.1.4, primary.cfg Created by ExtremeXOS version 15.3.1.4
+# Extreme Networks | ExtremeXOS | 15.X | switch
+# Model X670V-48t
+# ExtremeXOS version 12.5.1.6 v1251b6 by release-manager on Tue Nov 23 09:49:14 PST 2010
+Fingerprint Extreme Networks ExtremeXOS 12.5.1 or 15.3
+Class Extreme Networks | ExtremeXOS | 15.X | switch
+CPE cpe:/o:extremenetworks:extremexos:15.3
+Class Extreme Networks | ExtremeXOS | 12.X | switch
+CPE cpe:/o:extremenetworks:extremexos:12.5.1
+SEQ(SP=C0-D0%GCD=1-6%ISR=C7-D3%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4NNT11NW5%O2=M5B4NNT11NW5%O3=M5B4NNT11NW5%O4=M5B4NNT11NW5%O5=M5B4NNT11NW5%O6=M5B4NNT11)
+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=M5B4NW5%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=16A0%S=O%A=O|S+%F=A|AS%O=NNT11|M5B4NNT11NW5%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)
+
 # Extreme Networks | ExtremeXOS | 15.X | switch
 Fingerprint Extreme Networks ExtremeXOS 15
 Class Extreme Networks | ExtremeXOS | 15.X | switch
@@ -23728,26 +23787,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)
 
-# SysName: X450e-48p, Primary ver: 12.0.3.16, Secondary ver: 15.3.1.4, primary.cfg Created by ExtremeXOS version 15.3.1.4
-# Extreme Networks | ExtremeXOS | 15.X | switch
-# Model X670V-48t
-Fingerprint Extreme Networks Summit X440, X450e, or X670V switch (ExtremeXOS 15.3)
-Class Extreme Networks | ExtremeXOS | 15.X | switch
-CPE cpe:/o:extremenetworks:extremexos:15.3 auto
-SEQ(SP=C0-D0%GCD=1-6%ISR=C7-D3%TI=Z%CI=Z%II=I%TS=7)
-OPS(O1=M5B4NNT11NW5%O2=M5B4NNT11NW5%O3=M5B4NNT11NW5%O4=M5B4NNT11NW5%O5=M5B4NNT11NW5%O6=M5B4NNT11)
-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=M5B4NW5%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=16A0%S=O%A=O|S+%F=A|AS%O=NNT11|M5B4NNT11NW5%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)
-
 # ExtremeXOS 15
 # EXOS version summitX-16.1.2.14-patch1-1-ssh.xmod 16.1.2.14-patch1-1 (x460G2)
 Fingerprint Extreme Networks switch (ExtremeXOS 15 - 16)
@@ -24627,10 +24666,101 @@ 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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# FreeBSD 10.3-RELEASE FreeBSD 10.3-RELEASE #0: Tue May 10 16:15:55 EEST 2016     root@myhost:/usr/obj/usr/src/sys/NATIVE  i386
+Fingerprint FreeBSD 10.3-RELEASE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.3 auto
+SEQ(SP=FC-106%GCD=1-6%ISR=104-10E%TI=I%CI=I|RI%II=I%SS=S%TS=21)
+OPS(O1=M58CNW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M58CNW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M58CNW6SLL%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
+# FreeBSD 10.3-RELEASE FreeBSD 10.3-RELEASE #0 r297264: Fri Mar 25 02:10:02 UTC 2016     root@releng1.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
+Fingerprint FreeBSD 10.3-RELEASE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.3 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=S%TS=22)
+OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5B4NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M5B4NW6SLL%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=Y%T=3B-45%TG=40%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M109NW6ST11%RD=0%Q=)
+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=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%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=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
+# FreeBSD 10.3-RELEASE FreeBSD 10.3-RELEASE #0 r297264: Fri Mar 25 02:10:02 UTC 2016     root@releng1.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
+Fingerprint FreeBSD 10.3-RELEASE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.3 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=101-10B%TI=I%CI=I%II=I%SS=S%TS=20)
+OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M218NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M5B4NW6SLL%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
+# FreeBSD 10.3-RELEASE FreeBSD 10.3-RELEASE #0 r297264: Fri Mar 25 02:10:02 UTC 2016     root@releng1.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
+Fingerprint FreeBSD 10.3-RELEASE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.3 auto
+SEQ(SP=F9-103%GCD=1-6%ISR=106-110%TI=RI%TS=22)
+OPS(O1=M556NW6ST11%O2=M556NW6ST11%O3=M280NW6NNT11%O4=M564NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M556NW6SLL%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=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
+# FreeBSD localhost 10.3-STABLE FreeBSD 10.3-STABLE #0 r301088: Wed Jun  1 09:11:48 JST 2016     root@localhost:/usr/obj/usr/src/sys/GENERIC  amd64
+Fingerprint FreeBSD 10.3-STABLE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.3 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=104-10E%TS=U)
+OPS(O1=M5B4%O2=M578%O3=M514%O4=M3FD8%O5=M514%O6=M514)
+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=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=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=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 10.1-RELEASE-p10 FreeBSD 10.1-RELEASE-p10 #0 r282897M: Thu May 14 15:53:59 CEST 2015     root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64  amd64
 # FreeBSD 9.3-RELEASE-p9
 # FreeBSD 10.2-RELEASE-p12 FreeBSD 10.2-RELEASE-p12 #0 r296072M: Fri Feb 26 00:51:34 CET 2016     root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64
-Fingerprint NAS4Free (FreeBSD 9.3-RELEASE - 10.2-RELEASE)
+# FreeBSD  10.3-RELEASE-p5 FreeBSD 10.3-RELEASE-p5 #0 r302530M: Sun Jul 10 22:07:33 CEST 2016     root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64  amd64
+Fingerprint NAS4Free (FreeBSD 9.3-RELEASE - 10.3-RELEASE)
 Class FreeBSD | FreeBSD | 10.X | general purpose
 CPE cpe:/a:nas4free:nas4free
 CPE cpe:/o:freebsd:freebsd:10 auto
@@ -24704,6 +24834,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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Localhost
+# FreeBSD 12.0-CURRENT FreeBSD 12.0-CURRENT #1 r303871: Tue Aug  9 12:11:57 PDT 2016     root@xxxx:/usr/obj/usr/src/sys/GENERIC-ALTQ  amd64
+Fingerprint FreeBSD 12.0-CURRENT
+Class FreeBSD | FreeBSD | 12.X | general purpose
+CPE cpe:/o:freebsd:freebsd:12.0 auto
+SEQ(SP=F8-102%GCD=1-6%ISR=106-110%TI=Z%CI=Z%TS=20)
+OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M3FD8NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M5B4NW6SLL%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=FFFF%S=O%A=S+%F=AS%O=M109NW6ST11%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=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 2.2.9 (default everything, vmware)
 # 2.2.8-STABLE FreeBSD 2.2.8-STABLE  i386
 Fingerprint FreeBSD 2.2.8-STABLE - 2.2.9 (x86)
@@ -25746,24 +25895,6 @@ T7(R=N)
 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)
 
-# FreeBSD 6.3-RELEASE-p2 FreeBSD 6.3-RELEASE-p2 #2: Fri Jul 11 14:00:55 PDT 2008 i386
-Fingerprint FreeBSD 6.3-RELEASE
-Class FreeBSD | FreeBSD | 6.X | general purpose
-CPE cpe:/o:freebsd:freebsd:6.3
-SEQ(SP=FE-108%GCD=1-6%ISR=100-10A%TI=I%II=I%SS=S%TS=21)
-OPS(R=N)
-WIN(R=N)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M558NW1SLL%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #0: Fri Feb 15 17:27:45 EET 2008 i386
 Fingerprint FreeBSD 6.3-RELEASE-p1
 Class FreeBSD | FreeBSD | 6.X | general purpose
@@ -26655,7 +26786,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 Fingerprint FreeBSD 7.2-RELEASE
 Class FreeBSD | FreeBSD | 7.X | general purpose
 CPE cpe:/o:freebsd:freebsd:7.2
-SEQ(SP=FB-10B%GCD=2|4|6|8|A%ISR=100-10E%TI=I%II=I%SS=S%TS=21|22)
+SEQ(SP=FB-10B%GCD=1-6%ISR=100-10E%TI=I%II=I%SS=S%TS=21|22)
 OPS(O1=M5B4NW3ST11%O2=M578NW3ST11%O3=M280NW3NNT11%O4=M5B4NW3ST11%O5=M218NW3ST11%O6=M109ST11)
 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=M5B4NW3SLL%CC=N%Q=)
@@ -27070,7 +27201,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 Fingerprint FreeBSD 8.1-RELEASE
 Class FreeBSD | FreeBSD | 8.X | general purpose
 CPE cpe:/o:freebsd:freebsd:8.1
-SEQ(SP=EF-10B%GCD=2|4|6|8|A%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=21|22)
+SEQ(SP=EF-10B%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=21|22)
 OPS(O1=M5A0NW3ST11%O2=M578NW3ST11%O3=M280NW3NNT11%O4=M5A0NW3ST11%O5=M218NW3ST11%O6=M109ST11)
 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=M5A0NW3SLL%CC=N%Q=)
@@ -27408,6 +27539,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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# FreeBSD  9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC 2012
+Fingerprint FreeBSD 9.0-RELEASE
+Class FreeBSD | FreeBSD | 9.X | general purpose
+CPE cpe:/o:freebsd:freebsd:9.0 auto
+SEQ(SP=101-10B%GCD=2|4|6|8|A%ISR=104-10E%TI=I%II=I%SS=S%TS=21)
+OPS(O1=M529NW6ST11%O2=M529NW6ST11%O3=M280NW6NNT11%O4=M529NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M529NW6SLL%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #1: Mon Jul  2 13:47:36 EEST 2012     i386
 # FreeBSD 9.2-RELEASE-p10 FreeBSD 9.2-RELEASE-p10 #0 r262572+4fb5adc: Wed Aug  6 17:07:16 PDT 2014 amd64
 # FreeBSD hostname 10.1-RELEASE-p6 FreeBSD 10.1-RELEASE-p6 #0: Tue Feb 24 19:00:21 UTC 2015 amd64
@@ -27466,24 +27615,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O|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=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# FreeBSD 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Fri Jan 25 10:31:09 CST 2013     i386
-Fingerprint FreeBSD 9.1-RELEASE
-Class FreeBSD | FreeBSD | 9.X | general purpose
-CPE cpe:/o:freebsd:freebsd:9.1 auto
-SEQ(SP=103-10D%GCD=2|4|6|8|A%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=21)
-OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5B4NW6ST11%O5=M218NW6ST11%O6=M109ST11)
-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=M5B4NW6SLL%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=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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # FreeBSD 9.1-RELEASE-p7
 Fingerprint FreeBSD 9.1-RELEASE
 Class FreeBSD | FreeBSD | 9.X | general purpose
@@ -27522,6 +27653,27 @@ 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=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# FreeBSD 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Fri Jan 25 10:31:09 CST 2013     i386
+# FreeBSD 10.1-RELEASE-p6 FreeBSD 10.1-RELEASE-p6 #0 r279892: Wed Mar 11 14:05:36 PDT 2015
+Fingerprint FreeBSD 9.1-RELEASE or 10.1-RELEASE
+Class FreeBSD | FreeBSD | 9.X | general purpose
+CPE cpe:/o:freebsd:freebsd:9.1 auto
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.1
+SEQ(SP=103-10D%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=21)
+OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5B4NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M5B4NW6SLL%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=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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 9.1-STABLE FreeBSD 9.1-STABLE #0 r+6e53bbb: Thu Jul 11 18:23:04 CEST 2013 amd64
 Fingerprint FreeBSD 9.1-STABLE
 Class FreeBSD | FreeBSD | 9.X | general purpose
@@ -27630,6 +27782,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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# 9.3-RELEASE FreeBSD 9.3-RELEASE
+Fingerprint FreeBSD 9.3-RELEASE
+Class FreeBSD | FreeBSD | 9.X | general purpose
+CPE cpe:/o:freebsd:freebsd:9.3 auto
+SEQ(SP=FE-108%GCD=2|4|6|8|A%ISR=105-10F%TI=I%II=I%SS=S%TS=21)
+OPS(O1=M5A0NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5A0NW6ST11%O5=M218NW6ST11%O6=M109ST11)
+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=M5A0NW6SLL%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(R=N)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # FreeBSD 9.1-RC2 FreeBSD 9.1-RC2
 Fingerprint NAS4Free (FreeBSD 9.1)
 Class FreeBSD | FreeBSD | 9.X | general purpose
@@ -27796,6 +27966,78 @@ 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)
 
+# FUJI XEROX ApeosPort-IV C2275
+Fingerprint Fuji Xerox ApeosPort IV C2275 printer
+Class Fuji Xerox | embedded || printer
+CPE cpe:/h:fujixerox:apeosport_iv_c2275 auto
+SEQ(SP=8E-98%GCD=1-6%ISR=97-A1%TI=I%CI=I%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
+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=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=FA-104%TG=FF%W=0%S=A%A=Z%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=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=Z%F=R%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=138%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=Z)
+
+# Fuji Xerox Document Centre 706 CP. web service reports itself as a "Document Centre 706/606/506"
+Fingerprint Fuji Xerox Document Centre 706 CP printer
+Class Fuji Xerox | embedded || printer
+CPE cpe:/h:fujixerox:document_centre_706_cp
+SEQ(SP=B-15%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=96-A0%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=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
+ECN(R=Y%DF=N%T=19-23%TG=20%W=1000%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=19-23%TG=20%S=O%A=O|S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=19-23%TG=20%W=1000%S=O%A=O%F=A%O=%RD=0%Q=)
+T4(R=N)
+T5(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=19-23%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
+# Fuji-XEROX DocuPrint C525 A
+Fingerprint Fuji Xerox DocuPrint C525 A printer
+Class Fuji Xerox | embedded || printer
+CPE cpe:/h:fujixerox:docuprint_c525_a
+SEQ(R=N)
+OPS(O1=%O2=%O3=%O4=%O5=%O6=)
+WIN(W1=3000%W2=3000%W3=3000%W4=3000%W5=3000%W6=3000)
+ECN(R=Y%DF=N%T=19-23%TG=20%W=3000%O=%CC=N%Q=)
+T1(R=Y%DF=N%T=19-23%TG=20%S=Z%A=S+%F=AR%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=19-23%TG=20%W=3000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=19-23%TG=20%W=3000%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=19-23%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+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=FA-104%TG=FF%IPL=38%UN=0%RIPL=4E4%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
+# Fuji/Xerox cm205fw code version 01.00.07.
+Fingerprint Fuji Xerox DocuPrint CM205 printer
+Class Fuji Xerox | embedded || printer
+CPE cpe:/h:fujixerox: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)
+
 # Fujian Ruijie Star-S2800
 Fingerprint Fujian Ruijie Star-S2800 switch
 Class Fujian Ruijie | embedded || switch
@@ -29137,6 +29379,26 @@ 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)
 
+# Kernel version: 3.10.61-g197daf0 Android version: 5.0.1
+Fingerprint Android 5.0.1 (Linux 3.10)
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5.0.1 auto
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3.10 auto
+SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M550ST11NW6%O2=M550ST11NW6%O3=M550NNT11NW6%O4=M550ST11NW6%O5=M550ST11NW6%O6=M550ST11)
+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=M550NNSNW6%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)
+
 # 5.1 (lollipop) build: LMY47D
 Fingerprint Android 5.1
 Class Google | Android | 5.X | phone
@@ -30203,6 +30465,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=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# HP LaserJet 1022n
+Fingerprint HP LaserJet 1022n printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_1022n auto
+SEQ(SP=B-15%GCD=1E848|3D090|5B8D8|7A120|98968%ISR=9F-A9%TI=I%CI=I%II=I%SS=S%TS=9)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2238%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=Y%DF=Y%T=3B-45%TG=40%W=209D%S=O%A=S+%F=AS%O=M109NW0NNSNNT11%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=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)
+
 # HP LaserJet 1200
 Fingerprint HP LaserJet 1200 printer
 Class HP | embedded || printer
@@ -31304,9 +31584,8 @@ 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)
 
 # HP LaserJet Enterprise M605
-Fingerprint HP LaserJet Enterprise M605 printer
+Fingerprint HP LaserJet Enterprise M600-series printer
 Class HP | embedded || printer
-CPE cpe:/h:hp:laserjet_enterprise_m605 auto
 SEQ(SP=ED-107%GCD=1-6%ISR=F9-111%TI=I%CI=I|RD%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=B68%W2=B68%W3=B68%W4=B68%W5=B68%W6=B68)
@@ -33057,9 +33336,9 @@ 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)
 
 # HP-UX B.09.00 A 9000/42T 080009148e6a two-user license
-Fingerprint HP HP-UX B.09.00
+Fingerprint HP-UX B.09.00
 Class HP | HP-UX | 09.X | general purpose
-CPE cpe:/o:hp:hp-ux:09 auto
+CPE cpe:/o:hp:hp-ux:09.00 auto
 SEQ(SP=0-1D%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=95-9F%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)
@@ -33077,9 +33356,9 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 # HP-UX B.10.20 C 9000/810
 # HP-UX B.10.20 U 9000/861 2015893443
 # HP-UX B.10.20 E 9000/803
-Fingerprint HP HP-UX B.10.20
+Fingerprint HP-UX B.10.20
 Class HP | HP-UX | 10.X | general purpose
-CPE cpe:/o:hp:hp-ux:10 auto
+CPE cpe:/o:hp:hp-ux:10.20 auto
 SEQ(SP=0-1D%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=95-9F%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33095,9 +33374,9 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # HP-UX B10.20 A 9000/712
-Fingerprint HP HP-UX B.10.20
+Fingerprint HP-UX B.10.20
 Class HP | HP-UX | 10.X | general purpose
-CPE cpe:/o:hp:hp-ux:10 auto
+CPE cpe:/o:hp:hp-ux:10.20 auto
 SEQ(SP=0-5%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=95-9F%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33115,7 +33394,7 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 # HP-UX B.10.20 U 9000/755 2001674673 unlimited-user license
 Fingerprint HP-UX B.10.20
 Class HP | HP-UX | 10.X | general purpose
-CPE cpe:/o:hp:hp-ux:10 auto
+CPE cpe:/o:hp:hp-ux:10.20 auto
 SEQ(SP=0-5%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=95-9F%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=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33132,9 +33411,9 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # HP-UX B.11.00 A 9000/785 2013724412 two-user license
 # HP-UX B.11.00 U 9000/806 1949367251 unlimited-user license
-Fingerprint HP HP-UX B.11.00
+Fingerprint HP-UX B.11.00
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.00 auto
 SEQ(SP=73-B3%GCD=1-6%ISR=94-A4%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4W0NNNT11%O2=M578W0NNNT11%O3=M280W0NNNT11%O4=M218W0NNNT11%O5=M218W0NNNT11%O6=M109NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33150,9 +33429,9 @@ U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # HP-UX B.11.00 U 9000/800 664359393 unlimited-user license
-Fingerprint HP HP-UX B.11.00
+Fingerprint HP-UX B.11.00
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.00 auto
 SEQ(SP=99-A9%GCD=1-6%ISR=A5-B3%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M564NNSW0NNNT11%O2=M564NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33167,6 +33446,26 @@ T7(R=Y%DF=N%T=27-3E%TG=40%W=FFFF%S=A%A=S%F=AR%O=WFNM109T10S%RD=0%Q=)
 U1(DF=Y%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)
 
+# HP-UX B.11.00 C 9000/800 71977 32-user license
+# HP-UX B.11.23 U ia64 3431083894 unlimited-user license
+# HP-UX B.11.23 U ia64 3431083894 unlimited-user license
+Fingerprint HP-UX B.11.00 - B.11.23
+Class HP | HP-UX | 11.X | general purpose
+CPE cpe:/o:hp:hp-ux:11.00 auto
+SEQ(SP=92-A0%GCD=1-6%ISR=9D-AB%TI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
+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=M5B4NNSW0N%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=E44A4E43%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
+T7(R=N)
+U1(DF=Y%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)
+
 # HP-UX B.11.00 C 9000/800 160901537 32-user license
 # HP-UX B.11.11 U 9000/800 194404687 unlimited-user license
 # HP-UX B.11.11 U 9000/803 2008500218 unlimited-user license
@@ -33176,9 +33475,9 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # HP-UX B.11.00 U 9000/800 551740568
 # HP-UX B.11.00 U 9000/712 2006764246 unlimited-user license
 # HP-UX B.11.31 U ia64 4267365567 unlimited-user license
-Fingerprint HP HP-UX B.11.00 - B.11.31
+Fingerprint HP-UX B.11.00 - B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.00 auto
 SEQ(SP=85-A6%GCD=1-6%ISR=99-A8%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33194,9 +33493,9 @@ U1(DF=Y%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)
 
 # HP-UX B.11.11 U 9000/782 2010612016 unlimited-user license
-Fingerprint HP HP-UX B.11.11
+Fingerprint HP-UX B.11.11
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.11 auto
 SEQ(SP=96-A0%GCD=1-6%ISR=A2-AC%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33211,11 +33510,65 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
 U1(DF=Y%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)
 
+# HP-UX B.11.11 U 9000/800 3684009682 unlimited-user license
+Fingerprint HP-UX B.11.11
+Class HP | HP-UX | 11.X | general purpose
+CPE cpe:/o:hp:hp-ux:11.11 auto
+SEQ(SP=97-A1%GCD=1-6%ISR=9B-A5%TI=I%II=I%SS=S%TS=7)
+OPS(O1=M218NNSW0NNNT11%O2=M218NNSW0NNNT11%O3=M218W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=8000%O=M218NNSW0N%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M109NNSW0NNNT11%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
+U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
+# HP-UX B.11.11 U 9000/800 4165063165 unlimited-user license
+Fingerprint HP-UX B.11.11
+Class HP | HP-UX | 11.X | general purpose
+CPE cpe:/o:hp:hp-ux:11.11 auto
+SEQ(SP=95-B9%GCD=1-6%ISR=A9-B3%TI=I%II=I%SS=S%TS=8)
+OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
+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=M5B4NNSW0N%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M109NNSW0NNNT11%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
+U1(DF=Y%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)
+
+# HP-UX B.11.11 U 9000/800
+Fingerprint HP-UX B.11.11
+Class HP | HP-UX | 11.X | general purpose
+CPE cpe:/o:hp:hp-ux:11.11 auto
+SEQ(SP=88-A0%GCD=1-6%ISR=9A-A4%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=8000%O=M5B4NNSW0N%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M109NNSW0NNNT11%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
+U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # HP-UX B.11.11 U 9000/785 2015845248 unlimited-user license
 # HP-UX B.11.23 U 9000/800 2414933180 unlimited-user license
-Fingerprint HP HP-UX B.11.11 - B.11.23
+Fingerprint HP-UX B.11.11 - B.11.23
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.11 auto
 SEQ(SP=FC-10A%GCD=1-6%ISR=102-110%TI=I%CI=RD|RI%II=I%SS=S%TS=7|8)
 OPS(O1=M564NNSW0NNNT11%O2=M564NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33232,7 +33585,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
 # HP-UX B.11.11 U 9000/800
 # HP-UX B.11.23 U 9000/800
-Fingerprint HP HP-UX B.11.11 - B.11.23
+Fingerprint HP-UX B.11.11 - B.11.23
 Class HP | HP-UX | 11.X | general purpose
 CPE cpe:/o:hp:hp-ux:11
 SEQ(SP=84-AE%GCD=1-6%ISR=92-AC%TI=I%II=I%SS=S%TS=7)
@@ -33250,9 +33603,9 @@ U1(DF=Y%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)
 
 # HP-UX hostname B.11.23 U 9000/800 3724842035 unlimited-user license
-Fingerprint HP HP-UX B.11.23
+Fingerprint HP-UX B.11.23
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.23 auto
 SEQ(SP=81-8B%GCD=1-6%ISR=96-A0%TI=I%II=I%SS=O|S%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33268,9 +33621,9 @@ U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=0-FFFF%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
 # HP-UX B.11.23 U ia64 1913913181 unlimited-user license
-Fingerprint HP HP-UX B.11.23
+Fingerprint HP-UX B.11.23
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.23 auto
 SEQ(SP=FB-105%GCD=1-6%ISR=101-10B%TI=I|RD%II=I%SS=S%TS=7)
 OPS(O1=M564NNSW0NNNT11%O2=M564NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33286,9 +33639,28 @@ U1(DF=Y%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)
 
 # HP-UX B.11.31 U ia64
-Fingerprint HP HP-UX B.11.31
+# HP-UX B.11.23 U 9000/800 87931529 unlimited-user license
+Fingerprint HP-UX B.11.23 - B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.23 auto
+SEQ(SP=83-BB%GCD=1-6%ISR=97-B1%TI=I%CI=RD|RI%II=I%SS=S%TS=7)
+OPS(O1=M5B4NNSW2NNNT11|M5B4NNSW5NNNT11%O2=M578NNSW2NNNT11|M578NNSW5NNNT11%O3=M280W2NNNT11|M280W5NNNT11%O4=M218NNSW2NNNT11|M218NNSW5NNNT11%O5=M218NNSW2NNNT11|M218NNSW5NNNT11%O6=M109NNSNNT11)
+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=M5B4NNSW2N|M5B4NNSW5N%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M109NNSW2NNNT11|M109NNSW5NNNT11%RD=0%Q=)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
+U1(DF=Y%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)
+
+# HP-UX B.11.31 U ia64
+Fingerprint HP-UX B.11.31
+Class HP | HP-UX | 11.X | general purpose
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=EB-107%GCD=1-6%ISR=EE-106%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M564NNSW0NNNT11%O2=M564NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33304,9 +33676,9 @@ U1(DF=Y%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)
 
 # HP-UX B.11.31 U ia64
-Fingerprint HP HP-UX B.11.31
+Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=69-A7%GCD=1-6%ISR=95-AB%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M514NNSW0NNNT11%O2=M514NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33323,9 +33695,9 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
 # HP-UX B.11.31 U ia64 2867251542 unlimited-user license
 # HP-UX B.11.31 U 9000/800 3454442876 unlimited-user license
-Fingerprint HP HP-UX B.11.31
+Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=FB-107%GCD=1-6%ISR=100-112%TI=I%CI=RD|RI%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33341,9 +33713,9 @@ U1(DF=Y%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)
 
 # HP-UX B.11.31 U ia64 2863536258 unlimited-user license
-Fingerprint HP HP-UX B.11.31
+Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=100-10A%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33358,81 +33730,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
 U1(DF=Y%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)
 
-# HP-UX B.11.00 C 9000/800 71977 32-user license
-# HP-UX B.11.23 U ia64 3431083894 unlimited-user license
-# HP-UX B.11.23 U ia64 3431083894 unlimited-user license
-Fingerprint HP-UX B.11.00 - B.11.23
-Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
-SEQ(SP=92-A0%GCD=1-6%ISR=9D-AB%TI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
-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=M5B4NNSW0N%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=E44A4E43%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
-T7(R=N)
-U1(DF=Y%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)
-
-# HP-UX B.11.11 U 9000/800 3684009682 unlimited-user license
-Fingerprint HP-UX B.11.11
-Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
-SEQ(SP=97-A1%GCD=1-6%ISR=9B-A5%TI=I%II=I%SS=S%TS=7)
-OPS(O1=M218NNSW0NNNT11%O2=M218NNSW0NNNT11%O3=M218W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=N%T=3F%TG=40%W=8000%O=M218NNSW0N%CC=N%Q=)
-T1(R=Y%DF=N%T=3F%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=3F%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
-T3(R=Y%DF=N%T=3F%TG=40%W=8000%S=O%A=S+%F=AS%O=M109NNSW0NNNT11%RD=0%Q=)
-T4(R=Y%DF=Y%T=3F%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
-T5(R=Y%DF=N%T=3F%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
-T6(R=Y%DF=Y%T=3F%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
-T7(R=Y%DF=N%T=3F%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
-U1(DF=N%T=FE%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FE%TG=FF%CD=S)
-
-# HP-UX B.11.11 U 9000/800 4165063165 unlimited-user license
-Fingerprint HP-UX B.11.11
-Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
-SEQ(SP=95-B9%GCD=1-6%ISR=A9-B3%TI=I%II=I%SS=S%TS=8)
-OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
-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=M5B4NNSW0N%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M109NNSW0NNNT11%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
-U1(DF=Y%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)
-
-# HP-UX B.11.31 U ia64
-# HP-UX B.11.23 U 9000/800 87931529 unlimited-user license
-Fingerprint HP-UX B.11.23 - B.11.31
-Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
-SEQ(SP=83-BB%GCD=1-6%ISR=97-B1%TI=I%CI=RD|RI%II=I%SS=S%TS=7)
-OPS(O1=M5B4NNSW2NNNT11|M5B4NNSW5NNNT11%O2=M578NNSW2NNNT11|M578NNSW5NNNT11%O3=M280W2NNNT11|M280W5NNNT11%O4=M218NNSW2NNNT11|M218NNSW5NNNT11%O5=M218NNSW2NNNT11|M218NNSW5NNNT11%O6=M109NNSNNT11)
-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=M5B4NNSW2N|M5B4NNSW5N%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=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=E44A4E43%Q=)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M109NNSW2NNNT11|M109NNSW5NNNT11%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=E44A4E43%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=BD1AB510%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=EA6C967D%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
-U1(DF=Y%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)
-
 # HP-UX S64CJ036 B.11.31 U ia64 1104947000 unlimited-user license
 Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
@@ -33454,7 +33751,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # HP-UX B.11.31 U ia64
 Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=90-B4%GCD=1-6%ISR=99-B5%TI=I%CI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW2NNNT11%O2=M578NNSW2NNNT11%O3=M280W2NNNT11%O4=M218NNSW2NNNT11%O5=M218NNSW2NNNT11%O6=M109NNSNNT11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -33472,7 +33769,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # HP-UX B.11.31 U ia64 unlimited-user license
 Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=7C-A0%GCD=1-6%ISR=97-A1%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -33490,7 +33787,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # HP-UX B.11.31 U ia64 0672504076 unlimited-user license
 Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=F8-108%GCD=1-6%ISR=F8-10C%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M564NNSW2NNNT11%O2=M564NNSW2NNNT11%O3=M280W2NNNT11%O4=M218NNSW2NNNT11%O5=M218NNSW2NNNT11%O6=M109NNSNNT11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -33508,7 +33805,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # HP-UX B.11.31 U ia64 2178075513 unlimited-user license
 Fingerprint HP-UX B.11.31
 Class HP | HP-UX | 11.X | general purpose
-CPE cpe:/o:hp:hp-ux:11 auto
+CPE cpe:/o:hp:hp-ux:11.31 auto
 SEQ(SP=93-A1%GCD=1-6%ISR=99-A3%TI=I%CI=RD%II=I%SS=S%TS=7)
 OPS(O1=M5B4NNSW7NNNT11%O2=M578NNSW7NNNT11%O3=M280W7NNNT11%O4=M218NNSW7NNNT11%O5=M218NNSW7NNNT11%O6=M109NNSNNT11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -33523,6 +33820,155 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=EA6C967D%Q=)
 U1(DF=Y%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)
 
+# HP Integrated Lights Out II
+# HP Remote Insight Lights-Out Edition II
+Fingerprint HP iLO 2 remote management interface
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=0-35%GCD=1-6|68|D0|138|1A0|208%ISR=4B-55%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
+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=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# HP Remote Insight Lights-Out Edition II
+Fingerprint HP iLO 2 remote management interface
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=10-1C%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=97-A1%TI=I%II=I%SS=S%TS=1|2)
+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=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+U1(DF=Y%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RIPCK=Z%RUCK=0%RUD=G)
+IE(DFI=Y%T=3B-45%TG=40%CD=S)
+
+# ProLiant BL460c G1, iLO 2 Firmware Version: 1.50 03/12/2008
+# iLO-2 embedded management processor
+# HP iLO 2 version 1.70
+# iLO 2, Ver. 1.77, 04/23/2009
+# HP ProLiant DL370G6 iLO 2
+Fingerprint HP iLO 2 remote management interface
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=F8-10C%GCD=1-6%ISR=FB-113%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
+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=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# HP iLO2, Firmware Version 1.70 Dec 02 2008 (BL460C)
+Fingerprint HP iLO 2 remote management interface
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
+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=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=N)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# HP Integrated Lights Out 2. Copyright 2008
+Fingerprint HP iLO 2 remote management interface
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=107-111%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
+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=100%S=A%A=Z%F=R%O=%RD=0%Q=)
+T4(R=N)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# version 2.0 of the HP/compaq iLO 2 firmware.
+Fingerprint HP iLO 2 remote management interface version 2.0
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=F6-10C%GCD=1-6%ISR=105-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=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
+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=400%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# HP Integrated Lights-Out 2
+Fingerprint HP Integrated Lights-Out 2
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=108-112%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%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=N)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# HP DL320 iLO2 interface
+Fingerprint HP ProLiant DL320 iLO 2 remote management interface
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
+SEQ(SP=B-15%GCD=1-6%ISR=4B-55%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
+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=100%S=A%A=Z%F=R%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # HP iLO 3 firmware 1.26 on an HP ProLiant DL380 G7
 # HP ILO3 Card for firmware 1.26
 # HP ProLiant ML 350e G8 that hosts an HP iLO 4
@@ -33644,6 +34090,27 @@ 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=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# HP iLO
+# iLO 3 Advanced, Firmware 1.82 dated Jan 15 2015
+Fingerprint HP iLO 3 or iLO 4 remote management interface
+Class HP | iLO | 4.X | remote management
+CPE cpe:/o:hp:ilo:4 auto
+Class HP | iLO | 3.X | remote management
+CPE cpe:/o:hp:ilo:3 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=32E8%W2=30CC%W3=3110%W4=32E8%W5=3120%W6=306D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3354%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=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=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)
+
 # iLO 4 Advanced 1.30 at  Jul 18 2013
 # HP ILO4 Version 1.40
 Fingerprint HP iLO 4 remote management interface
@@ -33736,24 +34203,6 @@ 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=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# HP iLO
-Fingerprint HP iLO 4 remote management interface
-Class HP | iLO | 4.X | remote management
-CPE cpe:/o:hp:ilo:4 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
-WIN(W1=32E8%W2=30CC%W3=3110%W4=32E8%W5=3120%W6=306D)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3354%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=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=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)
-
 # Management Interface - iLO = integrated LightsOut (LightsOut 100i Standard, HP Proliant DL 140 G3)
 Fingerprint HP iLO 100i Standard remote management interface
 Class HP | iLO || remote management
@@ -33772,119 +34221,6 @@ T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=Z)
 
-# HP Integrated Lights Out II
-# HP Remote Insight Lights-Out Edition II
-Fingerprint HP iLO 2 remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=0-35%GCD=1-6|68|D0|138|1A0|208%ISR=4B-55%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-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=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
-# HP Remote Insight Lights-Out Edition II
-Fingerprint HP iLO 2 remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=10-1C%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=97-A1%TI=I%II=I%SS=S%TS=1|2)
-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=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=Y%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RIPCK=Z%RUCK=0%RUD=G)
-IE(DFI=Y%T=3B-45%TG=40%CD=S)
-
-# ProLiant BL460c G1, iLO 2 Firmware Version: 1.50 03/12/2008
-# iLO-2 embedded management processor
-# HP iLO 2 version 1.70
-# iLO 2, Ver. 1.77, 04/23/2009
-# HP ProLiant DL370G6 iLO 2
-Fingerprint HP iLO 2 remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=F8-10C%GCD=1-6%ISR=FB-113%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-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=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
-# HP iLO2, Firmware Version 1.70 Dec 02 2008 (BL460C)
-Fingerprint HP iLO 2 remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-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=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=N)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
-# HP Integrated Lights Out 2. Copyright 2008
-Fingerprint HP iLO 2 remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=100-10A%GCD=1-6%ISR=107-111%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-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=100%S=A%A=Z%F=R%O=%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
-# version 2.0 of the HP/compaq iLO 2 firmware.
-Fingerprint HP iLO 2 remote management interface version 2.0
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=F6-10C%GCD=1-6%ISR=105-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=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-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=400%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # "HP Integrated Lights-Out", only iLO, not iLO2
 # "HP Integrated Lights-Out 2". This is version 2 of the HP iLO remote management product.
 # iLO card on HP Proliant DL580-G2
@@ -33892,6 +34228,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 Fingerprint HP iLO or iLO 2 remote management interface
 Class HP | iLO || remote management
 CPE cpe:/o:hp:ilo auto
+Class HP | iLO | 2.X | remote management
+CPE cpe:/o:hp:ilo:2 auto
 SEQ(SP=0-5%GCD=64|C8|12C|190|1F4%ISR=4B-55%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
@@ -33906,24 +34244,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# HP DL320 iLO2 interface
-Fingerprint HP ProLiant DL320 iLO 2 remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(SP=B-15%GCD=1-6%ISR=4B-55%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-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=100%S=A%A=Z%F=R%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # HP Integrated Lights Out (for HP Proliant DL 320s)
 # The ILO from a HP Proliant ML310 G3
 Fingerprint HP ProLiant DL320s or ML310 iLO remote management interface
@@ -34737,6 +35057,42 @@ T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=F9-103%TG=FF%CD=S)
 
+# VRP (R) software, Version 5.160 (S5720 V200R007C00SPC500)
+Fingerprint Huawei VRP 5.160
+Class Huawei | VRP | 5.X | switch
+CPE cpe:/o:huawei:vrp:5.160 auto
+SEQ(SP=F7-105%GCD=1-6%ISR=F7-115%TI=I%CI=I%II=RI%SS=O|S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=FFFF%O=M5B4%CC=N%Q=)
+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=9000%S=A%A=Z%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=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=F9-103%TG=FF%CD=S)
+
+# Huawei VRP 8.100
+Fingerprint Huawei VRP 8.100
+Class Huawei | VRP | 8.X | broadband router
+CPE cpe:/o:huawei:vrp:8.100 auto
+SEQ(CI=I%TS=U)
+OPS(O1=M5B4%O2=M578%O3=M280%O4=M23D8%O5=M218%O6=M109)
+WIN(W1=F000%W2=F000%W3=F000%W4=F000%W5=F000%W6=F000)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=F000%O=M5B4%CC=N%Q=)
+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=0%S=A%A=Z%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=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # HWg-STE Ethernet thermometer/hygrometer http://www.hw-group.com
 Fingerprint HW group HWg-STE Ethernet thermometer
 Class HW group | embedded || specialized
@@ -34990,7 +35346,7 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # AIX 1 5 000F9E9F4C00
-Fingerprint AIX 5.1
+Fingerprint IBM AIX 5.1
 Class IBM | AIX | 5.X | general purpose
 CPE cpe:/o:ibm:aix:5.1 auto
 SEQ(SP=F6-100%GCD=1-6%ISR=101-10B%TI=I%CI=I%II=I%SS=S%TS=U)
@@ -35007,24 +35363,6 @@ T7(R=Y%DF=N%T=37-41%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=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# AIX hostname 3 5 00C967BE4C00
-Fingerprint AIX 5.3
-Class IBM | AIX | 5.X | general purpose
-CPE cpe:/o:ibm:aix:5.3 auto
-SEQ(SP=F9-107%GCD=1-6%ISR=109-113%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
-WIN(W1=40B0%W2=40B0%W3=4100%W4=4000%W5=40E8%W6=402E)
-ECN(R=Y%DF=Y%T=37-41%TG=40%W=40B0%O=M564%CC=N%Q=)
-T1(R=Y%DF=Y%T=37-41%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=37-41%TG=40%W=0%S=O%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=0%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # AIX REMOVEDHOSTNAME 1 5 (aix 5.1)
 Fingerprint IBM AIX 5.1
 Class IBM | AIX | 5.X | general purpose
@@ -35247,6 +35585,24 @@ T7(R=Y%DF=N%T=3B-3D%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=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# AIX hostname 3 5 00C967BE4C00
+Fingerprint IBM AIX 5.3
+Class IBM | AIX | 5.X | general purpose
+CPE cpe:/o:ibm:aix:5.3 auto
+SEQ(SP=F9-107%GCD=1-6%ISR=109-113%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M564%O2=M564%O3=M564%O4=M564%O5=M564%O6=M564)
+WIN(W1=40B0%W2=40B0%W3=4100%W4=4000%W5=40E8%W6=402E)
+ECN(R=Y%DF=Y%T=37-41%TG=40%W=40B0%O=M564%CC=N%Q=)
+T1(R=Y%DF=Y%T=37-41%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=37-41%TG=40%W=0%S=O%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=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # IBM AIX 5.3 TL-05 SP3
 # IBM AIX 5.3 (Maint. Pack 5) on RS/6000
 # IBM Power5 P570 running AIX 5.3 64bit [uname -a: AIX 3 5 00CF679E4C00]
@@ -35486,6 +35842,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)
 
+# 5.3.0.0
+Fingerprint IBM AIX 5.3
+Class IBM | AIX | 5.X | general purpose
+CPE cpe:/o:ibm:aix:5.3 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=109-113%TI=I|RD%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=37-41%TG=40%W=FFFF%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=Y%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=N%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=37-41%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=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # AIX 3 5
 # AIX 1 6 00C33E0A4C00
 Fingerprint IBM AIX 5.3 - 6.1
@@ -35493,7 +35867,7 @@ Class IBM | AIX | 5.X | general purpose
 CPE cpe:/o:ibm:aix:5 auto
 Class IBM | AIX | 6.X | general purpose
 CPE cpe:/o:ibm:aix:6 auto
-SEQ(SP=FD-107%GCD=1-6%ISR=100-10A%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=FD-107%GCD=1-6%ISR=100-10C%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=N%T=3B-3D%TG=40%W=FFFF%O=M5B4%CC=N%Q=)
@@ -35624,24 +35998,6 @@ T7(R=Y%DF=N%T=3B-3D%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=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# AIX 1 6, oslevel -s: 6100-09-03-1415
-Fingerprint AIX 6.1
-Class IBM | AIX | 6.X | general purpose
-CPE cpe:/o:ibm:aix:6.1 auto
-SEQ(SP=F6-100%GCD=1-6%ISR=100-10A%TI=I%CI=RD%II=I%SS=S%TS=1)
-OPS(O1=M578NW3NNT11%O2=M578NW3NNT11%O3=M578NW3NNT11%O4=M578NW2NNT11%O5=M578NW3NNT11%O6=M578NNT11)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=37-41%TG=40%W=FFFF%O=M578NW3%CC=N%Q=)
-T1(R=Y%DF=Y%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=S%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=S%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3C-46%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=G%RUCK=0%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # AIX Version 6
 Fingerprint IBM AIX 6
 Class IBM | AIX | 6.X | general purpose
@@ -35660,6 +36016,24 @@ T7(R=Y%DF=N%T=3B-3D%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=G%RUCK=0%RUD=G)
 IE(R=N)
 
+# AIX 1 6, oslevel -s: 6100-09-03-1415
+Fingerprint IBM AIX 6.1
+Class IBM | AIX | 6.X | general purpose
+CPE cpe:/o:ibm:aix:6.1 auto
+SEQ(SP=F6-100%GCD=1-6%ISR=100-10A%TI=I%CI=RD%II=I%SS=S%TS=1)
+OPS(O1=M578NW3NNT11%O2=M578NW3NNT11%O3=M578NW3NNT11%O4=M578NW2NNT11%O5=M578NW3NNT11%O6=M578NNT11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=37-41%TG=40%W=FFFF%O=M578NW3%CC=N%Q=)
+T1(R=Y%DF=Y%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=S%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=S%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3C-46%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=G%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # AIX 1  6  00014AAAD400
 Fingerprint IBM AIX 6.1
 Class IBM | AIX | 6.X | general purpose
@@ -35823,8 +36197,26 @@ T7(R=Y%DF=N%T=37-41%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=G%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# IBM AIX 6.1 TL8 SP3
+Fingerprint IBM AIX 6.1
+Class IBM | AIX | 6.X | general purpose
+CPE cpe:/o:ibm:aix:6.1 auto
+SEQ(SP=F6-100%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=1)
+OPS(O1=M41D8NW1NNT11%O2=M41D8NW1NNT11%O3=M41D8NW2NNT11%O4=M41D8NW1NNT11%O5=M41D8NW1NNT11%O6=M41D8NNT11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=37-41%TG=40%W=FFFF%O=M41D8NW2%CC=N%Q=)
+T1(R=Y%DF=N%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=37-41%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M41D8NW1NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=37-41%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=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # AIX 7.X
-Fingerprint AIX 7
+Fingerprint IBM AIX 7
 Class IBM | AIX | 7.X | general purpose
 CPE cpe:/o:ibm:aix:7 auto
 SEQ(SP=FF-109%GCD=1-6%ISR=105-10F%TI=I%II=I%SS=S%TS=1)
@@ -35842,7 +36234,7 @@ 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)
 
 # AIX localhost 1 7
-Fingerprint AIX 7.1
+Fingerprint IBM AIX 7.1
 Class IBM | AIX | 7.X | general purpose
 CPE cpe:/o:ibm:aix:7.1 auto
 SEQ(SP=F9-103%GCD=1-6%ISR=101-10B%TI=I%CI=I%II=I%SS=S%TS=1)
@@ -36525,7 +36917,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # IBM OS/400, runs System version V4R2M0.
 Fingerprint IBM OS/400 V4R2M0
 Class IBM | OS/400 | V4 | general purpose
-CPE cpe:/o:ibm:os_400:v4 auto
+CPE cpe:/o:ibm:os_400:v4r2 auto
 SEQ(SP=84-8E%GCD=1-6%ISR=8A-94%TI=I%CI=I%II=I%SS=S%TS=U)
 OPS(O1=M5AC%O2=M5AC%O3=M5AC%O4=M5AC%O5=M5AC%O6=M5AC)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36543,7 +36935,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # IBM OS/400 v4r3 on 720 machine
 Fingerprint IBM OS/400 V4R3
 Class IBM | OS/400 | V4 | general purpose
-CPE cpe:/o:ibm:os_400:v4 auto
+CPE cpe:/o:ibm:os_400:v4r3 auto
 SEQ(SP=6F-8D%GCD=1-6%ISR=8D-97%TI=I%II=I|RI%SS=O|S%TS=U)
 OPS(O1=M5AC%O2=M5AC%O3=M5AC%O4=M5AC%O5=M5AC%O6=M5AC)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36561,7 +36953,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # OS400 v4r3, Hardware platform 740
 Fingerprint IBM OS/400 V4R3
 Class IBM | OS/400 | V4 | general purpose
-CPE cpe:/o:ibm:os_400:v4 auto
+CPE cpe:/o:ibm:os_400:v4r3 auto
 SEQ(SP=37-8D%GCD=1-6%ISR=8A-94%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5AC%O2=M5AC%O3=M5AC%O4=M5AC%O5=M5AC%O6=M5AC)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36576,10 +36968,28 @@ 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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# RELEASE 3 MODIFICATION 0
+Fingerprint IBM OS/400 V4R3
+Class IBM | OS/400 | V4 | general purpose
+CPE cpe:/o:ibm:os_400:v4r3 auto
+SEQ(SP=73-7D%GCD=1-6%ISR=8B-95%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5AC%O2=M5AC%O3=M5AC%O4=M5AC%O5=M5AC%O6=M5AC)
+WIN(W1=FA00%W2=FA00%W3=FA00%W4=FA00%W5=FA00%W6=FA00)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=FA00%O=M5AC%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=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=FA00%S=O%A=S+%F=AS%O=M5AC%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # OS/400 V4R5, CUMPTF 02050
 Fingerprint IBM OS/400 V4R5
 Class IBM | OS/400 | V4 | general purpose
-CPE cpe:/o:ibm:os_400:v4 auto
+CPE cpe:/o:ibm:os_400:v4r5 auto
 SEQ(SP=0-5%GCD=1-6%ISR=0-5%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M59CNW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36597,7 +37007,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # AS400 model 170 with OS400 V4R4M0 L00
 Fingerprint IBM OS/400 V4R5M0
 Class IBM | OS/400 | V4 | general purpose
-CPE cpe:/o:ibm:os_400:v4 auto
+CPE cpe:/o:ibm:os_400:v4r5 auto
 SEQ(SP=10-1C%GCD=1-6%ISR=4B-55%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5A0NW0NNT11%O2=M56CNW0NNT11%O3=M274NW0NNT11%O4=M5A0NW0NNT11%O5=M20CNW0NNT11%O6=MFDNNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36633,7 +37043,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # IBM 9406-250 AS/400 server machine running IBM OS/400 V5R1M0.
 Fingerprint IBM OS/400 V5R1M0
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r1 auto
 SEQ(SP=C-16%GCD=1C00|1E00|3800|3C00|5400|5A00|7000|7800|8C00|9600%ISR=69-73%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M59CNW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36651,7 +37061,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # AS/400 model 270 with OS/400 V5R1M0
 Fingerprint IBM OS/400 V5R1M0
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r1 auto
 SEQ(SP=A2-B4%GCD=1-6%ISR=AD-B7%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M59CNW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36666,11 +37076,29 @@ 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=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# V5R2
+Fingerprint IBM OS/400 V5R2
+Class IBM | OS/400 | V5 | general purpose
+CPE cpe:/o:ibm:os_400:v5r2 auto
+SEQ(SP=A8-B2%GCD=200|400|500|600|800|A00|F00|1400|1900%ISR=E7-F1%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M59CNW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
+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=M5ACNW0%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=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=O%A=S+%F=AS%O=MF1NW0NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # IBM AS/400 - OS/400 - V5R2M0 L00
 # This is specifically for a "V5R3M0 L00" installed release of OS/400.
 Fingerprint IBM OS/400 V5R2 - V5R3
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r2 auto
 SEQ(SP=76-BA%GCD=1-6|10|20|30|40|50%ISR=AE-B8%TI=I%TS=A)
 OPS(O1=M59CNW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -36688,7 +37116,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # IBM OS/400 V05R02M00
 Fingerprint IBM OS/400 V5R2M0
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r2 auto
 SEQ(SP=A4-AE%GCD=1-6%ISR=AF-B9%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M59CNW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
 WIN(W1=59C%W2=560%W3=268%W4=200%W5=200%W6=F1)
@@ -36706,7 +37134,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # IBM OS/400 V5 Release 3 Modification 0
 Fingerprint IBM OS/400 V5R3
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r3 auto
 SEQ(SP=A8-B6%GCD=1-6|8|10|18|20|28%ISR=A6-B8%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M59CNW6NNT11%O2=M560NW6NNT11%O3=M268NW6NNT11%O4=M200NW6NNT11%O5=M200NW6NNT11%O6=MF1NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=FFFF)
@@ -36724,7 +37152,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # V5 R3 of the OS/400
 Fingerprint IBM OS/400 V5R3
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r3 auto
 SEQ(SP=6F-B3%GCD=1-6|10%ISR=AF-B9%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M564NW1NNT11%O2=M560NW1NNT11%O3=M268NW1NNT11%O4=M200NW1NNT11%O5=M200NW1NNT11%O6=MF1NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=FFFF)
@@ -36742,7 +37170,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # OS/400 version is V5R3  (other values are V5R4, V6R1)
 Fingerprint IBM OS/400 V5R3
 Class IBM | OS/400 | V5 | general purpose
-CPE cpe:/o:ibm:os_400:v5 auto
+CPE cpe:/o:ibm:os_400:v5r3 auto
 SEQ(SP=8A-C8%GCD=1-6%ISR=AD-B7%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M564NW0NNT11%O2=M560NW0NNT11%O3=M268NW0NNT11%O4=M200NW0NNT11%O5=M200NW0NNT11%O6=MF1NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -36991,11 +37419,29 @@ 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=N%T=3B-45%TG=40%CD=S)
 
+# z/OS 02.00 02 2827
+Fingerprint IBM z/OS 02.00 02 2827
+Class IBM | z/OS | 2.1.X | general purpose
+CPE cpe:/o:ibm:zos:2.1 auto
+SEQ(SP=F8-102%GCD=1-6%ISR=FC-106%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5ACNW5T11NN%O2=M5ACNW5T11NN%O3=M5ACNW5T11NN%O4=M5ACNW5T11NN%O5=M5ACNW5T11NN%O6=M5ACT11NN)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5ACNW5%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=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5ACNW5T11NN%RD=0%Q=)
+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=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=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # zOS 2.1
 Fingerprint IBM z/OS 2.1
 Class IBM | z/OS | 2.1.X | general purpose
 CPE cpe:/o:ibm:zos:2.1 auto
-SEQ(SP=101-10B%GCD=2|4|6|8|A%ISR=100-10A%TI=I|RD%CI=I%II=I%SS=S%TS=A|B)
+SEQ(SP=101-10B%GCD=1-6%ISR=100-10A%TI=I|RD%CI=I%II=I%SS=S%TS=A|B)
 OPS(O1=M5ACNW5T11NN%O2=M5ACNW5T11NN%O3=M5ACNW5T11NN%O4=M5ACNW5T11NN%O5=M5ACNW5T11NN%O6=M5ACT11NN)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5ACNW5%CC=N%Q=)
@@ -59328,6 +59774,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)
 
 # Linux 3.10.28+ #634 PREEMPT Sun Feb 2 15:16:25 GMT 2014 armv6l GNU/Linux
+# Google Glass XE22
 Fingerprint Linux 3.10
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3.10 auto
@@ -82121,7 +82568,7 @@ Class NodeMCU | embedded || specialized
 CPE cpe:/o:nodemcu:nodemcu
 Class lwIP | lwIP || general purpose
 CPE cpe:/a:lwip_project:lwip
-SEQ(SP=1A-24%GCD=1-6%ISR=6C-76%TI=I%CI=I%II=RI%SS=O%TS=U)
+SEQ(SP=1A-9A%GCD=1-6%ISR=6C-84%TI=I|RD%CI=I|RD%II=RI%SS=O|S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=16D0%O=M5B4%CC=N%Q=)
@@ -94898,6 +95345,26 @@ T7(R=N)
 U1(DF=N%T=1B-25%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=1B-25%TG=20%CD=S)
 
+#  EAP330, kernel version 2.6.36
+Fingerprint TP-LINK EAP330 WAP (Linux 2.6.36)
+Class TP-LINK | embedded || WAP
+CPE cpe:/h:tp-link:eap330 auto
+Class Linux | Linux | 2.6.X | general purpose
+CPE cpe:/o:linux:linux_kernel:2.6.36 auto
+SEQ(SP=CB-D5%GCD=1-6%ISR=CD-D7%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW4%O2=M5B4ST11NW4%O3=M5B4NNT11NW4%O4=M5B4ST11NW4%O5=M5B4ST11NW4%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=M5B4NNSNW4%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)
+
 # TP-LINK 150Mbps Wireless N ADSL2+ Modem Router, Firmware Version: 4.0.0 Build 120207 Rel.10587
 Fingerprint TP-LINK TD-W8951ND wireless ADSL modem
 Class TP-LINK | embedded || WAP
@@ -98209,24 +98676,6 @@ 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
@@ -98282,42 +98731,6 @@ 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=15C%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# Fuji Xerox Document Centre 706 CP. web service reports itself as a "Document Centre 706/606/506"
-Fingerprint Xerox Document Centre 706 CP printer
-Class Xerox | embedded || printer
-CPE cpe:/h:xerox:document_centre_706_cp
-SEQ(SP=B-15%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=96-A0%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=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
-ECN(R=Y%DF=N%T=19-23%TG=20%W=1000%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=19-23%TG=20%S=O%A=O|S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=19-23%TG=20%W=1000%S=O%A=O%F=A%O=%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=19-23%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
-# Fuji-XEROX DocuPrint C525 A
-Fingerprint Xerox DocuPrint C525 A printer
-Class Xerox | embedded || printer
-CPE cpe:/h:xerox:docuprint_c525_a
-SEQ(R=N)
-OPS(O1=%O2=%O3=%O4=%O5=%O6=)
-WIN(W1=3000%W2=3000%W3=3000%W4=3000%W5=3000%W6=3000)
-ECN(R=Y%DF=N%T=19-23%TG=20%W=3000%O=%CC=N%Q=)
-T1(R=Y%DF=N%T=19-23%TG=20%S=Z%A=S+%F=AR%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=19-23%TG=20%W=3000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=19-23%TG=20%W=3000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=19-23%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-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=FA-104%TG=FF%IPL=38%UN=0%RIPL=4E4%RID=G%RIPCK=Z%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # xerox phaser 3150 printer
 Fingerprint Xerox Phaser 3150 printer
 Class Xerox | embedded || printer