diff --git a/nmap-os-db b/nmap-os-db
index 1f462b525..8fd9868c2 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -18559,6 +18559,7 @@ IE(DFI=N%T=38-42%TG=40%CD=Z)
 Fingerprint Crestron MC2E, MP2E, PRO2, or QM-RMC control and automation system, or HP StorageWorks MSL4048 tape library
 Class Crestron | embedded || specialized
 Class HP | embedded || storage-misc
+CPE cpe:/h:hp:storageworks_msl4048
 SEQ(SP=EE-10C%GCD=1-6%ISR=FF-10F%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=3E80%W2=3E80%W3=3E80%W4=3E80%W5=3E80%W6=3E80)
@@ -18573,6 +18574,46 @@ 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=N%T=3B-45%TG=40%CD=S)
 
+# cm-12-20150314-NIGHTLY-bacon
+Fingerprint CyanogenMod 12 (Android 5.0)
+Class CyanogenMod | CyanogenMod | 12.X | phone
+CPE cpe:/o:cyanogenmod:cyanogenmod:12 auto
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5 auto
+SEQ(SP=BC-C6%GCD=1-6%ISR=C6-D0%TI=Z%CI=I%TS=U)
+OPS(O1=M5B4NNSNW1%O2=M5B4NNSNW1%O3=M5B4NW1%O4=M5B4NNSNW1%O5=M5B4NNSNW1%O6=M5B4NNS)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=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)
+
+# Android Lollipop v5.0.2 (CyanogenMod 12)
+Fingerprint CyanogenMod 12 (Android 5.0.2)
+Class CyanogenMod | CyanogenMod | 12.X | phone
+CPE cpe:/o:cyanogenmod:cyanogenmod:12 auto
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=108-112%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
+WIN(W1=A9B0%W2=A9B0%W3=A9B0%W4=A9B0%W5=A9B0%W6=A9B0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=A564%O=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=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)
+
 # CybeRoam Unified Threat Management -> Application Firewall
 Fingerprint Cyberoam UTM firewall
 Class Cyberoam | embedded || firewall
@@ -27491,24 +27532,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=Z%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# FujitsuSiemens PocketLoox 750, Windows Mobile 5
-Fingerprint Fujitsu Siemens Pocket LOOX 750 GPS device (Windows Mobile 5)
-Class Fujitsu Siemens | Windows | PocketPC/CE | PDA
-CPE cpe:/o:fujitsu:windows_ce auto
-SEQ(SP=72-7C%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M1F4ANW0NNT00NNS%O2=M1F4ANW0NNT00NNS%O3=M1F4ANW0NNT00%O4=M1F4ANW0NNT00NNS%O5=M1F4ANW0NNT00NNS%O6=M1F4ANNT00NNS)
-WIN(W1=832C%W2=8340%W3=8200%W4=81D0%W5=81D0%W6=805C)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=832C%O=M1F4ANW0NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=805C%S=O%A=S+%F=AS%O=M1F4ANW0NNT00NNS%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
 # Fujitsu Eternus DX90 Storage controller, Model Name ET092DCU, Firmware Version V10L50-0000
 Fingerprint Fujitsu Eternus DX90 storage controller
 Class Fujitsu | embedded || storage-misc
@@ -28615,6 +28638,27 @@ 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)
 
+# Cyanogenmod nightlies
+# Linux 3.10.49-g38a3dc5c hudsoncm@ilclbld52 #1 Fri Jun 19 23:31:27 CDT 2015 (Android 5.1)
+Fingerprint Android 5.0 - 5.1 (Linux 3.10)
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5 auto
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=109-113%TI=Z%CI=I|RD%II=I%TS=7)
+OPS(O1=M5B4ST11NW8%O2=M5B4ST11NW8%O3=M5B4NNT11NW8%O4=M5B4ST11NW8%O5=M5B4ST11NW8%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NNSNW8%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Android Lollipop 5.0.1
 Fingerprint Android 5.0.1
 Class Google | Android | 5.X | phone
@@ -28633,6 +28677,78 @@ 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)
 
+# Android 5.0.2
+Fingerprint Android 5.0.2
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=106-110%TI=Z%CI=I|Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NNSNW7%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
+# Android 5.1 Stock version
+Fingerprint Android 5.1
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=100-110%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=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=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
+CPE cpe:/o:google:android:5 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=104-10E%TI=Z%CI=I%II=I%TS=8)
+OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=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=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)
+
+# AOSP 5.1
+Fingerprint Android 5.1
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5 auto
+SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M5B4ST11NW4%O2=M5B4ST11NW4%O3=M5B4NNT11NW4%O4=M5B4ST11NW4%O5=M5B4ST11NW4%O6=M5B4ST11)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=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)
+
 # Google Mini Search Appliance version 5 or above.
 Fingerprint Google Mini search appliance
 Class Google | embedded || specialized
@@ -29092,6 +29208,24 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# HIKVISION DS-7600 Linux Embedded NVR
+Fingerprint HIKVISION DS-7600 Linux Embedded NVR (Linux 2.6.10)
+Class Hikvision | Linux | 2.6.X | specialized
+CPE cpe:/o:hikvision:linux_kernel:2.6 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=109-113%TI=Z%CI=Z%TS=U)
+OPS(O1=M5B4NW5%O2=M5B4NW5%O3=M5B4NW5%O4=M5B4NW5%O5=M5B4NW5%O6=M5B4)
+WIN(W1=3908%W2=3908%W3=3908%W4=3908%W5=3908%W6=3908)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3908%O=M5B4NW5%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)
+
 # Hikvision 7200 series DVR for surveillance cameras
 # Q-SEE QT5440 Digital Video Recorder, Kernel Version C9K7-D3B3-D753, Firmware Version 3.3.0.P-3520A-03
 # QSEE QT5682 Network Security Camera DVR System Kernel Version: D6L3-D8L3
@@ -30500,7 +30634,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
 # HP LaserJet 600 M602
 # HP LaserJet flow MFP M830
-Fingerprint HP LaserJet 600 M602, 500 M551, or M830 printer
+# HP LaserJet 600 M601
+Fingerprint HP LaserJet 600 M601, 600 M602, 500 M551, or M830 printer
 Class HP | embedded || printer
 SEQ(SP=FB-10B%GCD=1-6%ISR=FB-113%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -30663,6 +30798,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 CP1515N
+Fingerprint HP Laserjet CP1515n printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_cp1515n auto
+SEQ(SP=A6-B0%GCD=1-6%ISR=A9-B3%TI=I%II=I%SS=S%TS=A)
+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=N)
+T4(R=N)
+T5(R=Y%DF=N%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=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 Color LaserJet CP1518ni
 Fingerprint HP LaserJet CP1518ni printer
 Class HP | embedded || printer
@@ -30830,6 +30983,24 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%RD=0)
 U1(DF=N%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FB-105%TG=FF%CD=S)
 
+# HP Color LaserJet MFP M476dw
+Fingerprint HP LaserJet M476dw printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_m476dw auto
+SEQ(SP=100-10A%GCD=1-6%ISR=101-111%TI=I|RD%CI=I%II=I%TS=A|C)
+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=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=N)
+U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=FA-104%TG=FF%CD=S)
+
 # HP LaserJet Professional P1102w
 Fingerprint HP LaserJet P1102w
 Class HP | embedded || printer
@@ -30883,6 +31054,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 Professional P1606dn Firmware Datecode:      20130213
+Fingerprint HP LaserJet P1606dn printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_p1606dn auto
+SEQ(SP=A0-BA%GCD=1-6%ISR=AC-B6%CI=I%II=I%TS=A)
+OPS(O1=M5B4NNSNNT11%O2=M578NNSNNT11%O3=M280NNT11%O4=M5B4NNSNNT11%O5=M218NNSNNT11%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=M5B4NNS%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)
+
 # HP LaserJet P2015.
 Fingerprint HP LaserJet P2015 printer
 Class HP | embedded || printer
@@ -30991,6 +31180,24 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# HP LaserJet P3015
+Fingerprint HP LaserJet P3015 printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:laserjet_p3015 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=108-112%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=2DA0%W2=2DA0%W3=2DA0%W4=2DA0%W5=2DA0%W6=2DA0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2DA0%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=N)
+U1(DF=N%T=3B-45%TG=40%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # HP LaserJet 4050
 # HP Laserjet 4100
 # HP JetDirect       : J6057A   Firmware Version   : R.25.47 (HP 8150 printer)
@@ -31083,6 +31290,24 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# Officejet Pro 8500 A910 (Model CM756A)
+Fingerprint HP Officejet Pro 8500 printer
+Class HP | embedded || printer
+CPE cpe:/h:hp:officejet_pro_8500 auto
+SEQ(SP=B0-BA%GCD=1-6%ISR=AE-B8%CI=I%TS=A)
+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=N%T=3B-45%TG=40%W=2238%O=M5B4NW0NNS%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=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=N)
+U1(R=N)
+IE(R=N)
+
 # HP Photosmart 5520
 Fingerprint HP Photosmart 5520 printer
 Class HP | embedded || printer
@@ -31279,6 +31504,23 @@ 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 psc 2400 series
+Fingerprint HP PSC 2400-series Photosmart printer
+Class HP | embedded || printer
+SEQ(CI=I%II=I)
+OPS(R=N)
+WIN(R=N)
+ECN(R=N)
+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=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=N)
+U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # ProFibre Storage Array DF-4000 with firmware 9.40.0.0
 # HP LaserJet 2420
 # "Siemens C-110" ADSL Modem (Not Wireless)
@@ -31309,6 +31551,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=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# HP MSM WLAN Controller, Model MSM765zl, OS Ver: 6.3.0.0-15824
+Fingerprint HP MSM765zl WLAN controller
+Class HP | embedded || remote management
+CPE cpe:/h:hp:msm765zl
+SEQ(SP=C7-D1%GCD=1-6%ISR=C9-D3%TI=Z%CI=Z%II=I%TS=8|A)
+OPS(O1=%O2=M574ST11NW6%O3=M574NNT11NW6%O4=M574ST11NW6%O5=M574ST11NW6%O6=M574ST11)
+WIN(W1=16D0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=N)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=O%F=A%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # HP Onboard Administrator, Firmware Version 2.04
 Fingerprint HP Onboard Administrator management console
 Class HP | embedded || remote management
@@ -31349,12 +31609,13 @@ 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 BladeSystem Onboard Administrator Firmware 4.12
+# HP BladeSystem Onboard Administrator
 Fingerprint HP Onboard Administrator remote management for BladeSystem server enclosures
 Class HP | embedded || remote management
-SEQ(SP=FB-105%GCD=1-6%ISR=FD-107%TI=Z%CI=Z%II=I%TS=8)
-OPS(O1=M5B4NNT11NW6%O2=M5B4NNT11NW6%O3=M5B4NNT11NW6%O4=M5B4NNT11NW6%O5=M5B4NNT11NW6%O6=M5B4NNT11)
+SEQ(SP=FB-107%GCD=1-6%ISR=FD-111%TI=Z%CI=Z%II=I%TS=8)
+OPS(O1=M5B4NNT11NW2|M5B4NNT11NW6%O2=M5B4NNT11NW2|M5B4NNT11NW6%O3=M5B4NNT11NW2|M5B4NNT11NW6%O4=M5B4NNT11NW2|M5B4NNT11NW6%O5=M5B4NNT11NW2|M5B4NNT11NW6%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=M5B4NW6%CC=N%Q=)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NW2|M5B4NW6%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)
@@ -31424,6 +31685,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # HP MSL 4048 Firmware Revision: 7.80 Firmware Build date: 06-29-2011
 Fingerprint HP MSL4048 tape library
 Class HP | embedded || storage-misc
+CPE cpe:/h:hp:storageworks_msl4048
 SEQ(SP=FA-104%GCD=2|4|6|8|A%ISR=106-110%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=3E80%W2=3E80%W3=3E80%W4=3E80%W5=3E80%W6=3E80)
@@ -31438,6 +31700,24 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%RD=0)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# HP P2000 G3 FC/iSCSI Controller
+Fingerprint HP P2000 G3 FC/iSCSI controller
+Class HP | embedded || storage-misc
+CPE cpe:/h:hp:storageworks_p2000_g3_msa_fc%2fiscsi_dual_combo_controller_lff_array_system
+SEQ(SP=C7-D1%GCD=1-6%ISR=C6-D0%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW1%O2=M5B4ST11NW1%O3=M5B4NNT11NW1%O4=M5B4ST11NW1%O5=M5B4ST11NW1%O6=M5B4ST11)
+WIN(W1=1C48%W2=1C48%W3=1C48%W4=1C48%W5=1C48%W6=1C48)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=1C84%O=M5B4NNSNW1%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=1C48%S=O%A=S+%F=AS%O=M5B4ST11NW1%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)
+
 # HP P2000 G3 SAS Storage Management interface
 Fingerprint HP P2000 G3 NAS device
 Class HP | embedded || storage-misc
@@ -31456,6 +31736,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(DFI=N%T=3B-45%TG=40%CD=S)
 
+# HP MSL4048 tape library
+Fingerprint HP StorageWorks MSL4048 tape library
+Class HP | embedded || storage-misc
+CPE cpe:/h:hp:storageworks_msl4048
+SEQ(SP=FF-109%GCD=1-6%ISR=FD-107%TI=I|RD%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4SW0NNN%O2=M5B4SW0NNN%O3=M5B4W0N%O4=M5B4SW0NNN%O5=M5B4SW0NNN%O6=M5B4SNN)
+WIN(W1=3E80%W2=3E80%W3=3E80%W4=3E80%W5=3E80%W6=3E80)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3E80%O=M5B4SW0NNN%CC=N)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0)
+T2(R=N)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=3E80%S=O%A=S+%F=AS%O=M5B4SW0NNN%RD=0)
+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=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # HP StorageWorks MSL6000 Tape Library, 10BaseT NIC
 Fingerprint HP StorageWorks MSL6000 tape library
 Class HP | embedded || storage-misc
@@ -31680,9 +31978,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=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)
 
+# GbE2c L2/L3 Ethernet Blade Switch for HP c-Class BladeSystem.
+Fingerprint HP GbE2c Ethernet Blade switch
+Class HP | embedded || switch
+CPE cpe:/h:hp:gbe2c
+SEQ(SP=88-92%GCD=2|4|6|8|A%ISR=8D-97%TI=I%CI=I%II=I%TS=U)
+OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M218)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=4000%O=M218%CC=N%Q=)
+T1(R=Y%DF=N%T=FA-104%TG=FF%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=AR%O=%RD=0%Q=)
+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(DFI=N%T=FA-104%TG=FF%CD=S)
+
 # GbE2c Ethernet Blade Switch for HP c-Class BladeSystem
 Fingerprint HP GbW2c Ethernet Blade Switch
 Class HP | embedded || switch
+CPE cpe:/h:hp:gbe2c
 SEQ(SP=A4-B4%GCD=1-6%ISR=9E-B2%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
@@ -32822,6 +33139,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 iLO 4.X
+Fingerprint HP iLO 4 remote management interface
+Class HP | iLO | 4.X | remote management
+CPE cpe:/o:hp:ilo:4 auto
+SEQ(SP=101-10B%GCD=1-6%ISR=107-111%TI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
+WIN(W1=8218%W2=8220%W3=8204%W4=8218%W5=80F4%W6=807A)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=832C%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=N)
+T5(R=Y%DF=N%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=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
@@ -32974,6 +33309,24 @@ 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 (unknown version)
+Fingerprint HP iLO 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%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M5B4%O6=M5B4)
+WIN(W1=8218%W2=8220%W3=8204%W4=8218%W5=8000%W6=8000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=8000%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=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 DL320 iLO2 interface
 Fingerprint HP ProLiant DL320 iLO 2 remote management interface
 Class HP | iLO || remote management
@@ -33137,6 +33490,24 @@ T7(R=Y%DF=N|Y%T=37-41%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)
 
+# Real Time Supervisor Machine
+Fingerprint HP OpenVMS 6
+Class HP | OpenVMS | 6.X | general purpose
+CPE cpe:/o:hp:openvms:6 auto
+SEQ(SP=E2-EC%GCD=10|20|30|40|50%ISR=FF-109%TI=I%CI=I%II=I%SS=O%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=F000%W2=F000%W3=F000%W4=F000%W5=F000%W6=F000)
+ECN(R=Y%DF=N%T=37-41%TG=40%W=F000%O=M5B4%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=F000%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+T4(R=Y%DF=Y%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=37-41%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=S%T=3B-45%TG=40%CD=S)
+
 # VAX/VMS V6.1  on node <redacted>  20-JUL-2008 08:17:41.30   Uptime  0 00:27:01
 Fingerprint HP OpenVMS 6.1
 Class HP | OpenVMS | 6.X | general purpose
@@ -33395,7 +33766,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # OSF1 V5.1 2650 alpha
 Fingerprint HP Tru64 UNIX 5.1 (Alpha)
 Class HP | Tru64 UNIX | 5.X | general purpose
-CPE cpe:/o:hp:tru64_unix:5 auto
+CPE cpe:/o:hp:tru64:5 auto
 SEQ(SP=E2-EC%GCD=10|20|30|40|50|60%ISR=107-111%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
 WIN(W1=F000%W2=F000%W3=F000%W4=F000%W5=F000%W6=F000)
@@ -33413,7 +33784,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # HP Tru64 UNIX, OS Version is 5.1A -- this was also known as Compaq Tru64 Unix and DEC Tru64 Unix
 Fingerprint HP Tru64 UNIX 5.1A
 Class HP | Tru64 UNIX | 5.X | general purpose
-CPE cpe:/o:hp:tru64_unix:5 auto
+CPE cpe:/o:hp:tru64:5 auto
 SEQ(SP=D3-DD%GCD=10|20|30|40|50%ISR=108-112%II=I%TS=U)
 OPS(O1=M58CNW0%O2=M58CNW0%O3=M58CNW0%O4=M58CNW0%O5=M58CNW0%O6=M58C)
 WIN(W1=F000%W2=F000%W3=F000%W4=F000%W5=F000%W6=F000)
@@ -33431,7 +33802,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # HP Tru64 UNIX V5.1B (Rev. 2650)
 Fingerprint HP Tru64 UNIX 5.1B
 Class HP | Tru64 UNIX | 5.X | general purpose
-CPE cpe:/o:hp:tru64_unix:5 auto
+CPE cpe:/o:hp:tru64:5 auto
 SEQ(SP=FB-107%GCD=1-6%ISR=102-10C%II=I%TS=U)
 OPS(O1=M5B4NW0NNS%O2=M5B4NW0NNS%O3=M5B4NW0NNS%O4=M5B4NW0NNS%O5=M5B4NW0NNS%O6=M5B4NNS)
 WIN(W1=F53C%W2=F0A0%W3=F000%W4=F000%W5=F0C8%W6=F028)
@@ -33446,6 +33817,24 @@ T7(R=Y%DF=N%T=7B-85%TG=80%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=S%T=3B-45%TG=40%CD=S)
 
+# Version 5.1B with patch kit 3 (last legal version released with final patches)
+Fingerprint HP Tru64 UNIX 5.1b
+Class HP | Tru64 UNIX | 5.X | general purpose
+CPE cpe:/o:hp:tru64:5.1b
+SEQ(SP=DA-E4%GCD=10|20|30|40|50%ISR=109-113%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
+WIN(W1=F000%W2=F000%W3=F000%W4=F000%W5=F000%W6=F000)
+ECN(R=Y%DF=N%T=37-41%TG=40%W=F000%O=M5B4NW0%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=N)
+T4(R=Y%DF=Y%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=37-41%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=37-41%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=S%T=3B-45%TG=40%CD=S)
+
 # SB5100E-2.3.2.3-SCM00-NOSH
 # HP Procurve 2650 Switch Model HP J4899A
 Fingerprint HP LaserJet 3600 printer, HP ProCurve 2650 switch, or Motorola SURFboard SB5100E cable modem
@@ -33514,24 +33903,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)
 
-# HTC Touch Pro
-Fingerprint HTC Touch mobile phone (Windows Mobile 6)
-Class HTC | Windows | PocketPC/CE | phone
-CPE cpe:/o:htc:windows_ce auto
-SEQ(R=N)
-OPS(O1=M559NW1NNT00NNS%O2=%O3=%O4=%O5=%O6=)
-WIN(W1=FFFF%W2=0%W3=0%W4=0%W5=0%W6=0)
-ECN(R=Y%DF=N|Y%T=7B-85%TG=80%W=0|FFFF%O=|M559NW1NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
 # ZyXel Prestige 623ME-T1 ADSL dual link router
 # Huawei SmartAX MT800u-T
 # ZyXEL Prestige 2602R-61
@@ -34832,10 +35203,11 @@ 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)
 
 # sendmail version AIX6.1/8.13.4
+# 6100-02-10-1036
 Fingerprint IBM AIX 6.1
 Class IBM | AIX | 6.X | general purpose
 CPE cpe:/o:ibm:aix:6 auto
-SEQ(SP=FF-109%GCD=1-6%ISR=102-10C%TI=I%CI=I%II=I%SS=S%TS=21)
+SEQ(SP=FD-109%GCD=1-6%ISR=102-10C%TI=I%CI=I%II=I%SS=S%TS=21)
 OPS(O1=M5B4NW2NNT11%O2=M5B4NW3NNT11%O3=M5B4NW3NNT11%O4=M5B4NW2NNT11%O5=M5B4NW3NNT11%O6=M5B4NNT11)
 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=M5B4NW3%CC=N)
@@ -34921,6 +35293,24 @@ 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)
 
+# AIX 1 6
+Fingerprint IBM AIX 6.1
+Class IBM | AIX | 6.X | general purpose
+CPE cpe:/o:ibm:aix:6.1
+SEQ(SP=F1-FB%GCD=1-6%ISR=10A-114%TI=I%CI=I%II=I%SS=S%TS=1)
+OPS(O1=M55ANW2NNT11%O2=M55ANW2NNT11%O3=M55ANW3NNT11%O4=M55ANW2NNT11%O5=M55ANW3NNT11%O6=M55ANNT11)
+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=M55ANW3%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=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # AIX 7.X
 Fingerprint AIX 7
 Class IBM | AIX | 7.X | general purpose
@@ -36929,6 +37319,24 @@ T7(R=N)
 U1(DF=N%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)
 
+# Native SmartOS zone on a hypervisor machine
+Fingerprint Joyent SmartOS
+Class Joyent | SmartOS || general purpose
+CPE cpe:/o:joyent:smartos auto
+SEQ(SP=9B-A5%GCD=1-6%ISR=A6-B0%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=ST11M5B4NW5%O2=ST11M5B4NW5%O3=NNT11M5B4NW5%O4=ST11M5B4NW5%O5=ST11M5B4NW5%O6=ST11M5B4)
+WIN(W1=8026%W2=8017%W3=8005%W4=800E%W5=800E%W6=FFF7)
+ECN(R=Y%DF=Y%T=37-41%TG=40%W=8024%O=M5B4NNSNW5%CC=Y%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=Y%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=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=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)
+
 # TOYOPUC PC10 PLC
 Fingerprint JTEKT Toyopuc PC10 programmable logic controller
 Class JTEKT | embedded || specialized
@@ -37241,6 +37649,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=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Juniper | JUNOS | 12.X | router
+Fingerprint Juniper Networks JUNOS 12
+Class Juniper | JunOS | 12.X | router
+CPE cpe:/o:juniper:junos:12 auto
+SEQ(SP=FA-104%GCD=1-6%ISR=102-10C%TI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
+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=M5B4NW1SLL%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=N%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=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # ex2200 switch
 Fingerprint Juniper EX2200 switch (JUNOS 12)
 Class Juniper | JUNOS | 12.X | switch
@@ -37259,6 +37685,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=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Juniper | JUNOS | 12.X | switch
+Fingerprint Juniper Networks JUNOS 12
+Class Juniper | JUNOS | 12.X | switch
+CPE cpe:/o:juniper:junos:12 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=105-10F%CI=I%TS=A)
+OPS(O1=M558NW1NNT11SLL%O2=M558NW1NNT11SLL%O3=M558NW1NNT11%O4=M558NW1NNT11SLL%O5=M558NW1NNT11SLL%O6=M558NNT11SLL)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=3C-46%TG=40%W=FFFF%O=M558NW1SLL%CC=N%Q=)
+T1(R=Y%DF=Y%T=3C-46%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3C-46%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M558NW1NNT11SLL%RD=0%Q=)
+T4(R=Y%DF=N%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3C-46%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=Z%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=Y%T=FB-105%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3C-46%TG=40%CD=S)
+
 # Juniper WXC-590, JUNOS Software version: 5.4.4.0
 Fingerprint Juniper Networks WXC-590 proxy server (JUNOS 5.4.4.0)
 Class Juniper | JUNOS | 5.X | proxy server
@@ -37890,6 +38334,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=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
+# Konica Minolta Color MF24-2
+Fingerprint Konica Minolta Color MF24-2 printer
+Class Konica Minolta | embedded || printer
+CPE cpe:/h:konicaminolta:color_mf24-2 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=8)
+OPS(O1=M55ENW0NNT11%O2=M55ENW0NNT11%O3=M55ENW0NNT11%O4=M55ENW0NNT11%O5=M55ENW0NNT11%O6=M55ENNT11)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=Y%T=3A-44%TG=40%W=4000%O=M55ENW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3A-44%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3A-44%TG=40%W=4000%S=O%A=S+%F=AS%O=M55ENW0NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3A-44%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3A-44%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3A-44%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3A-44%TG=40%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=S%T=3A-44%TG=40%CD=S)
+
 # KONICA MINOLTA Di2510f
 Fingerprint Konica Minolta Di2510f printer
 Class Konica Minolta | embedded || printer
@@ -38218,6 +38680,24 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# LaCie Ethernet Disk
+Fingerprint LaCie Ethernet Disk (Windows XP Embedded)
+Class LaCie | Windows | XP | storage-misc
+CPE cpe:/o:lacie:windows_xp auto
+SEQ(SP=7F-89%GCD=1-6%ISR=97-A1%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NNS%O2=M5B4NNS%O3=M5B4%O4=M5B4NNS%O5=M5B4NNS%O6=M5B4NNS)
+WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=4000%O=M5B4NNS%CC=N%Q=)
+T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
 # LaCie 1TB NAS running Windows XP Embedded, Software Version 5.1.0, BIOS Version CLE266 - 42302e31
 # LaCie NAS. Windows XP Embedded. Software version 5.1.2, Bios version CLE266 - 42302e31
 Fingerprint LaCie NAS device (Windows XP Embedded)
@@ -38525,6 +39005,24 @@ 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=37-41%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(R=N)
 
+# Lantronix MSS100 Version V3.6/9(030114)
+Fingerprint Lantronix MSS100 print server
+Class Lantronix | embedded || print server
+CPE cpe:/h:lantronix:mss100 auto
+SEQ(SP=13-43%GCD=1-6|A|14|1E|28|32%ISR=90-9A%TI=I%CI=I%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=E00%W2=E00%W3=E00%W4=E00%W5=E00%W6=E00)
+ECN(R=Y%DF=N%T=37-41%TG=40%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=N%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=37-41%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=37-41%TG=40%W=0%S=A%A=S+%F=AR%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=S+%F=AR%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=37-41%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=N%T=37-41%TG=40%CD=Z)
+
 # Lantronix Model UDS-1100, Firmware 6.5.0.7, Web Configuration version 1.6.0.0
 # Lantronix UDS1100 Firmware Version:       V6.1.0.3
 Fingerprint Lantronix UDS1100 external serial device server
@@ -39619,6 +40117,24 @@ T7(R=Y%DF=N%T=91-9B%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=91-9B%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=91-9B%TG=FF%CD=S)
 
+# BEFSR41 V3 Firmware Version: 1.05.03
+Fingerprint Linksys BEFSR41 router
+Class Linksys | embedded || router
+CPE cpe:/h:linksys:befsr41 auto
+SEQ(CI=I%II=I)
+OPS(R=N)
+WIN(R=N)
+ECN(R=Y%DF=N%T=91-9B%TG=FF%W=3%O=%CC=N%Q=U)
+T1(R=N)
+T2(R=Y%DF=N%T=91-9B%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=91-9B%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=91-9B%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=91-9B%TG=FF%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=91-9B%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=91-9B%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=91-9B%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=91-9B%TG=FF%CD=S)
+
 # Linksys BEFSR81, firmware version: 2.44.2, Dec 13 2002
 Fingerprint Linksys BEFSR81 router
 Class Linksys | embedded || router
@@ -44274,10 +44790,11 @@ U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Linux 2.6.18-274.7.1.el5PAE #1 SMP Mon Oct 17 12:05:46 EDT 2011 i686 i686 i386 GNU/Linux, Red Hat Enterprise Linux Client release 5.7 (Tikanga)
+# Linux 2.6.18-398.el5xen #1 SMP Tue Aug 12 06:30:31 EDT 2014 x86_64 x86_64 x86_64 GNU/Linux RHEL 5.11
 Fingerprint Linux 2.6.18
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=100-10C%GCD=1-6%ISR=107-111%TI=Z%CI=Z%II=I%TS=A)
+SEQ(SP=100-10C%GCD=1-6%ISR=107-111%TI=Z%CI=Z%II=I%TS=8|A)
 OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%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=M5B4NNSNW7%CC=N)
@@ -57419,6 +57936,26 @@ 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)
 
+# Android OS 4.4.4 running on LG Nexus 5, 3.4.0-gd59db4e android-build@vpbs1.mtv.corp.google.com #1 Mon Mar 17 15:16:36 PDT 2014
+Fingerprint Android 4.4.4 (Linux 3.4)
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3.4
+Class Google | Android | 4.X | phone
+CPE cpe:/o:google:android:4.4.4
+SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=Z%CI=Z%II=I%TS=7)
+OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
+WIN(W1=A9B0%W2=A9B0%W3=A9B0%W4=A9B0%W5=A9B0%W6=A9B0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=A564%O=M5B4NNSNW6%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=O%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=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Linux linaro-ubuntu-desktop 3.0.51 #1 SMP PREEMPT Fri Jan 4 18:02:22 KST 2013 armv7l armv7l armv7l GNU/Linux
 Fingerprint ODROID-U2 Android development board (Linux 3.0)
 Class Linux | Linux | 3.X | specialized
@@ -57569,6 +58106,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)
 
+# OpenWRT CHAOS CALMER (Bleeding Edge, r45264) kernel 3.18.10-1-db18831523892bc50953de74ea42b8ac
+# Linksys wrt1900ac running OpenWrt Chaos Calmer r44455
+Fingerprint OpenWrt Chaos Calmer 15.05 (Linux 3.18)
+Class Linux | Linux | 3.X | WAP
+CPE cpe:/o:linux:linux_kernel:3.18
+SEQ(SP=FC-106%GCD=1-6%ISR=100-10A%TI=Z%CI=I|RD%II=I%TS=7)
+OPS(O1=M5B4ST11NW2|M5B4ST11NW5%O2=M5B4ST11NW2|M5B4ST11NW5%O3=M5B4NNT11NW2|M5B4NNT11NW5%O4=M5B4ST11NW2|M5B4ST11NW5%O5=M5B4ST11NW2|M5B4ST11NW5%O6=M5B4ST11)
+WIN(W1=7120%W2=7120%W3=7120%W4=7120%W5=7120%W6=7120)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW2|M5B4NNSNW5%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Linux CentOS5 2.6.18-8.el5 #1 SMP Thu Mar 15 19:46:53 EDT 2007 x86_64 x86_64 x86_64 GNU/Linux
 Fingerprint Linux 2.6.18 (CentOS 5, x86_64, SMP)
 Class Linux | Linux || general purpose
@@ -58198,6 +58754,148 @@ T7(R=N)
 U1(DF=N%T=19-23%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=N%T=19-23%TG=20%CD=Z)
 
+# 4.21.1088 (Microsoft Windows Mobile 2003 Pocket PC Phone Edition)- ARM
+# Microsoft Windows Mobile 2003 Second Edition [Version 4.21.1088 (Build 14132)] - HP iPAQ rz1710 PDA (ARM)
+# Device is a Eizo eClient 630L. Since I bricked the WinCE install I can't log onto the device itself anymore so I couldn't run winver. The vendor states it runs Microsoft Windows CE.NET 4.1 tho.
+Fingerprint Microsoft Windows Mobile 2003 PocketPC
+Class Microsoft | Windows Mobile | 2003 | PDA
+CPE cpe:/o:microsoft:windows_mobile:2003 auto
+SEQ(SP=6E-8A%GCD=1-6%ISR=95-9F%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=8000%O=M5B4NW0NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=8000%S=O%A=S+%F=AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
+# Windows Mobile 6 Classic, CE OS 5.2.1437 (Build 17944.0.3.1)
+# Asus P535 PDA running Windows Mobile 6.0
+# Microsoft Windows Mobile Version 5.0 SO 5.1.195 (Compilacion 14989.2.6.0)
+# Microsoft Zune with Firmware v2.2
+# Windows Mobile 6 Professional, CE OS 5.2.1620 (Build 18125.0.4.2), running on a HTC Touch (P3450) mobile phone
+# OS is Windows CE 5 version V6.01.06
+# Windows Mobile 6.1 Professional CE OS 5.2.19971 (Build 19971.1.26)
+# Canon ScanFront 220
+# HP Neoware Thin Client C50: Running a Microsoft Windows CE Pro 5.0 embedded on a DOM chip.
+Fingerprint Microsoft Windows Mobile 5.0 - 6.1 or Zune audio player (firmware 2.2)
+Class Microsoft | Windows Mobile | 5.X | general purpose
+CPE cpe:/o:microsoft:windows_mobile:5 auto
+Class Microsoft | Windows Mobile | 6.X | general purpose
+CPE cpe:/o:microsoft:windows_mobile:6 auto
+Class Microsoft | embedded || media device
+SEQ(SP=75-9B%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
+WIN(W1=832C%W2=8340%W3=8200%W4=81D0%W5=81D0%W6=805C)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=832C%O=M5B4NW0NNS%CC=N%Q=)
+T1(R=Y%DF=N|Y%T=7B-85%TG=80%S=O|Z%A=S+%F=AR|AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N|Y%T=7B-85%TG=80%W=0|805C%S=O|Z%A=O|S+%F=AR|AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
+# FujitsuSiemens PocketLoox 750, Windows Mobile 5
+Fingerprint Fujitsu Siemens Pocket LOOX 750 GPS device (Windows Mobile 5)
+Class Microsoft | Windows Mobile | 5.X | PDA
+CPE cpe:/o:microsoft:windows_mobile:5 auto
+SEQ(SP=72-7C%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M1F4ANW0NNT00NNS%O2=M1F4ANW0NNT00NNS%O3=M1F4ANW0NNT00%O4=M1F4ANW0NNT00NNS%O5=M1F4ANW0NNT00NNS%O6=M1F4ANNT00NNS)
+WIN(W1=832C%W2=8340%W3=8200%W4=81D0%W5=81D0%W6=805C)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=832C%O=M1F4ANW0NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=805C%S=O%A=S+%F=AS%O=M1F4ANW0NNT00NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
+# HP Compaq t5520 CE thin client device running Microsoft Windows CE Version 5.00
+# Windows Mobile 6 Professional CE OS 5.2.1437 (Build 17944.0.3.1), HTC Tytn (Mobile Phone)
+# Windows CE .Net version 5.0
+Fingerprint Microsoft Windows Mobile 6 (CE OS 5.0 - 5.2)
+Class Microsoft | Windows Mobile | 6.X | general purpose
+CPE cpe:/o:microsoft:windows_mobile:6 auto
+SEQ(SP=6E-96%GCD=1-6%ISR=93-9D%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M5B4NW1NNT00NNS%O2=M5B4NW1NNT00NNS%O3=M5B4NW1NNT00%O4=M5B4NW1NNT00NNS%O5=M5B4NW1NNT00NNS%O6=M5B4NNT00NNS)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M5B4NW1NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW1NNT00NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
+# HTC Touch Pro
+Fingerprint HTC Touch mobile phone (Windows Mobile 6)
+Class Microsoft | Windows Mobile | 6.X | phone
+CPE cpe:/o:microsoft:windows_mobile:6 auto
+SEQ(R=N)
+OPS(O1=M559NW1NNT00NNS%O2=%O3=%O4=%O5=%O6=)
+WIN(W1=FFFF%W2=0%W3=0%W4=0%W5=0%W6=0)
+ECN(R=Y%DF=N|Y%T=7B-85%TG=80%W=0|FFFF%O=|M559NW1NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
+# HTC Kaiser, branded by T-Mobile as an MDA Vario III, Windows Mobile version 6.0 for Pocket PC
+# windows mobile 6.1 on an HTC touch pro 2
+Fingerprint Microsoft Windows Mobile 6.0 - 6.1
+Class Microsoft | Windows Mobile | 6.X | phone
+CPE cpe:/o:microsoft:windows_mobile:6 auto
+SEQ(SP=82-8C%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O2=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O3=M1F4ANW1NNT00|M1F4ANW3NNT00%O4=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O5=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O6=M1F4ANNT00NNS)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M1F4ANW1NNS|M1F4ANW3NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%S=O%A=S+%F=AS%O=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=7B-85%TG=80%CD=Z)
+
+# Windows Mobile 6 Smartphone (Motorola Q9c). No console access available at the moment - About dialog box gives "CE OS 5.2.1810 (Build 18325.0.6.3)"
+Fingerprint Motorola Q9c mobile phone (Windows Mobile 6)
+Class Microsoft | Windows Mobile | 6.X | phone
+CPE cpe:/o:microsoft:windows_mobile:6 auto
+SEQ(SP=72-86%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
+OPS(O1=MF4ANW1NNT00NNS%O2=MF4ANW1NNT00NNS%O3=MF4ANW1NNT00%O4=MF4ANW1NNT00NNS%O5=MF4ANW1NNT00NNS%O6=MF4ANNT00NNS)
+WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
+ECN(R=Y%DF=Y%T=FFB1-FFBB%TG=FF%W=FFFF%O=MF4ANW1NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=FFB1-FFBB%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=FFB1-FFBB%TG=FF%W=FFFF%S=O%A=S+%F=AS%O=MF4ANW1NNT00NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=FFB1-FFBB%TG=FF%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=FFB1-FFBB%TG=FF%CD=Z)
+
 # Windows 2000 Server [Italian]
 Fingerprint Microsoft Windows 2000
 Class Microsoft | Windows | 2000 | general purpose
@@ -65970,53 +66668,6 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
 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 Mobile 6 Classic, CE OS 5.2.1437 (Build 17944.0.3.1)
-# Asus P535 PDA running Windows Mobile 6.0
-# Microsoft Windows Mobile Version 5.0 SO 5.1.195 (Compilacion 14989.2.6.0)
-# Microsoft Zune with Firmware v2.2
-# Windows Mobile 6 Professional, CE OS 5.2.1620 (Build 18125.0.4.2), running on a HTC Touch (P3450) mobile phone
-# OS is Windows CE 5 version V6.01.06
-# Windows Mobile 6.1 Professional CE OS 5.2.19971 (Build 19971.1.26)
-# Canon ScanFront 220
-# HP Neoware Thin Client C50: Running a Microsoft Windows CE Pro 5.0 embedded on a DOM chip.
-Fingerprint Microsoft Windows Mobile 5.0 - 6.1 or Zune audio player (firmware 2.2)
-Class Microsoft | Windows | PocketPC/CE | general purpose
-CPE cpe:/o:microsoft:windows_ce auto
-Class Microsoft | embedded || media device
-SEQ(SP=75-9B%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
-WIN(W1=832C%W2=8340%W3=8200%W4=81D0%W5=81D0%W6=805C)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=832C%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=N|Y%T=7B-85%TG=80%S=O|Z%A=S+%F=AR|AS%RD=0%Q=)
-T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N|Y%T=7B-85%TG=80%W=0|805C%S=O|Z%A=O|S+%F=AR|AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
-# HP Compaq t5520 CE thin client device running Microsoft Windows CE Version 5.00
-# Windows Mobile 6 Professional CE OS 5.2.1437 (Build 17944.0.3.1), HTC Tytn (Mobile Phone)
-# Windows CE .Net version 5.0
-Fingerprint Microsoft Windows Mobile 6 (CE OS 5.0 - 5.2)
-Class Microsoft | Windows | PocketPC/CE | general purpose
-CPE cpe:/o:microsoft:windows_ce auto
-SEQ(SP=6E-96%GCD=1-6%ISR=93-9D%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M5B4NW1NNT00NNS%O2=M5B4NW1NNT00NNS%O3=M5B4NW1NNT00%O4=M5B4NW1NNT00NNS%O5=M5B4NW1NNT00NNS%O6=M5B4NNT00NNS)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M5B4NW1NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW1NNT00NNS%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
 # Windows 5.1 (Build 2600.xpsp_sp3_gdr.090804-1435 : Service Pack 3)
 # AT&T Uverse home DVR
 # AT&T U-Verse Motorola set top boxes 
@@ -66084,63 +66735,6 @@ T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
-# 4.21.1088 (Microsoft Windows Mobile 2003 Pocket PC Phone Edition)- ARM
-# Microsoft Windows Mobile 2003 Second Edition [Version 4.21.1088 (Build 14132)] - HP iPAQ rz1710 PDA (ARM)
-# Device is a Eizo eClient 630L. Since I bricked the WinCE install I can't log onto the device itself anymore so I couldn't run winver. The vendor states it runs Microsoft Windows CE.NET 4.1 tho.
-Fingerprint Microsoft Windows Mobile 2003 PocketPC
-Class Microsoft | Windows | PocketPC/CE | PDA
-CPE cpe:/o:microsoft:windows_ce auto
-SEQ(SP=6E-8A%GCD=1-6%ISR=95-9F%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=8000%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=8000%S=O%A=S+%F=AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
-# HTC Kaiser, branded by T-Mobile as an MDA Vario III, Windows Mobile version 6.0 for Pocket PC
-# windows mobile 6.1 on an HTC touch pro 2
-Fingerprint Microsoft Windows Mobile 6.0 - 6.1
-Class Microsoft | Windows | PocketPC/CE | phone
-CPE cpe:/o:microsoft:windows_ce auto
-SEQ(SP=82-8C%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O2=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O3=M1F4ANW1NNT00|M1F4ANW3NNT00%O4=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O5=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%O6=M1F4ANNT00NNS)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%O=M1F4ANW1NNS|M1F4ANW3NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=FFFF%S=O%A=S+%F=AS%O=M1F4ANW1NNT00NNS|M1F4ANW3NNT00NNS%RD=0%Q=)
-T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
-# Windows Mobile 6 Smartphone (Motorola Q9c). No console access available at the moment - About dialog box gives "CE OS 5.2.1810 (Build 18325.0.6.3)"
-Fingerprint Motorola Q9c mobile phone (Windows Mobile 6)
-Class Microsoft | Windows | PocketPC/CE | phone
-CPE cpe:/o:microsoft:windows_ce auto
-SEQ(SP=72-86%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
-OPS(O1=MF4ANW1NNT00NNS%O2=MF4ANW1NNT00NNS%O3=MF4ANW1NNT00%O4=MF4ANW1NNT00NNS%O5=MF4ANW1NNT00NNS%O6=MF4ANNT00NNS)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=FFB1-FFBB%TG=FF%W=FFFF%O=MF4ANW1NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=FFB1-FFBB%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=FFB1-FFBB%TG=FF%W=FFFF%S=O%A=S+%F=AS%O=MF4ANW1NNT00NNS%RD=0%Q=)
-T4(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FFB1-FFBB%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FFB1-FFBB%TG=FF%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FFB1-FFBB%TG=FF%CD=Z)
-
 # Microsoft Windows CE 5.0 on ARMV4 processor, Samsung ARM920T-S3C2440A, netDCU8 board
 # direct IP link via browser returns: MSN TV rm4100
 Fingerprint Microsoft Windows CE 5.0 (ARM)