diff --git a/nmap-os-db b/nmap-os-db
index c8e5d8265..1e5f96cad 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -157,9 +157,11 @@ IE(DFI=N%T=FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # 3Com Super Stack 4300 48x100Mbit Switch w. Firmware Version  V1.12 and Hardware Version 4.0
 # Samsung ML-2571N printer, Main Firmware Version: OS 1.01.01.18 05-03-2007, Network Firmware Version: V4.02.05(ML-2571N) 04-25-2007
-Fingerprint 3Com SuperStack 3 Switch 4300 or Samsung ML-2571N printer
+# Xerox Phaser 3125/N network printer
+Fingerprint 3Com SuperStack 3 Switch 4300, Samsung ML-2571N printer, or Xerox Phaser 3125N printer
 Class 3Com | embedded || switch
 Class Samsung | embedded || printer
+Class Xerox | embedded || printer
 SEQ(SP=B-15%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=96-A0%TI=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)
@@ -791,8 +793,11 @@ U1(DF=Y%T=40%TG=40%TOS=0%IPL=38%UN=6B33|AD02|D0C3%RIPL=G%RID=G%RIPCK=G%RUCK=G%RU
 IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # AMBIT DOCSIS 2.0 Cable Modem :: Boot Code Version : 2.1.5 / Software Version : 5.11.1130 / Hardware version 4.7
-Fingerprint AMBIT DOCSIS 2.0 Cable Modem hardware v4.7
+# Xerox Phaser 6350DT Network Printer
+# OS: 5.78; Engine 3.1.0;
+Fingerprint Ambit DOCSIS 2.0 cable modem, or Xerox Phaser 6250N or 6350DT printer
 Class Ambit | embedded || broadband router
+Class Xerox | embedded || printer
 SEQ(SP=E-52%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=98-C4%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -2961,22 +2966,6 @@ T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=40%TG=40%TOSI=Z%CD=Z%SI=S%DLI=S)
 
-Fingerprint Captor Omni-Clock (employee timeclock)
-Class Captor | embedded || specialized
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Zoom X5 ADSL Modem (CastleNet AS80x branded as a ZoomX5 ADSL Modem)
 Fingerprint Zoom X5 ADSL modem
 Class CastleNet | embedded || broadband router
@@ -4106,7 +4095,8 @@ U1(DF=N%T=FF%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
 # CIsco 2960
-Fingerprint Cisco Catalyst 2960 switch
+# IOS (tm) 3600 Software (C3640-IK9S-M), Version 12.3(20), RELEASE SOFTWARE (fc2)
+Fingerprint Cisco Catalyst 2960 or 3600 switch
 Class Cisco | IOS | 12.X | switch
 SEQ(SP=FE-108%GCD=<7%ISR=102-10C%TI=Z%II=RI%TS=U)
 OPS(O1=M5B4%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
@@ -7078,7 +7068,7 @@ IE(DFI=N%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # HP Jetdirect 175x Fast Ethernet Print Server (J6035G) with a HP LaserJet 1012 attached.
 # HP JetDirect 610n (J4169A) Fast Ethernet Print Server
-Fingerprint HP JetDirect 175x (J6035G) or 610n (J4169A) Fast Ethernet Print Server
+Fingerprint HP JetDirect 175x (J6035G) or 610n (J4169A) print server
 Class HP | embedded || print server
 SEQ(SP=92-9C%GCD=<7%ISR=9A-A4%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -7186,7 +7176,9 @@ IE(DFI=S%T=3C%TG=3C%TOSI=S%CD=S%SI=S%DLI=S)
 # HP Photosmart 8400   Model HPF2109W040W firmware version:QF1P133G
 # HP DeskJet 6127
 # HP Officejet 7400
-Fingerprint HP DeskJet 6127, OfficeJet 7400, or Photosmart 8400 printer
+# HP Deskjet 6840
+# HP Officejet Pro K550
+Fingerprint HP DeskJet 6127 or 6840, OfficeJet 7400, OfficeJet Pro K550, or Photosmart 8400 printer
 Class HP | embedded || printer
 SEQ(SP=B-15%GCD=1E848|3D090|5B8D8|7A120|98968|B71B0%ISR=9F-A9%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
@@ -7706,7 +7698,8 @@ IE(DFI=S%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 # HP Officejet Pro L7600
 # HP Deskjet 6940
 # HP OfficeJet Pro L7780 Embedded Webserver (EWS)
-Fingerprint HP Photosmart All-in-One (2575, PSC5100, C6100, or C6180); DeskJet 6940 or 6980; OfficeJet 6300-series; or OfficeJet Pro L7600 or L7780 printer
+# HP Officejet Pro K5400
+Fingerprint HP printer: Photosmart All-in-One (2575, PSC5100, C6100, or C6180); DeskJet (6940 or 6980); OfficeJet 6300-series; or OfficeJet Pro (K5400, L7600, or L7780)
 Class HP | embedded || printer
 SEQ(SP=34-44%GCD=9C4|1388|1D4C|2710|30D4%ISR=9F-A9%TI=I%II=I%SS=S%TS=A)
 OPS(O1=NNT11|M5B4NW0NNSNNT11%O2=NNT11|M578NW0NNSNNT11%O3=NNT11|M280NW0NNT11%O4=NNT11|M5B4NW0NNSNNT11%O5=NNT11|M218NW0NNSNNT11%O6=NNT11|M109NNSNNT11)
@@ -7903,8 +7896,10 @@ IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # HP Procurve 2524 (firmware F.05.34)
 # HP Procurve 2524 (firmware F.05.17)
-Fingerprint HP ProCurve 2524 switch
+# HP Jetdirect 175x Model J6035A, Firmware version M.21.21
+Fingerprint HP ProCurve 2524 switch or JetDirect 175x print server (J6035A)
 Class HP | embedded || switch
+Class HP | embedded || printer
 SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -8575,7 +8570,8 @@ IE(DFI=S%T=FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # IBM AIX 5.1.0.0
 # AIX 1 5, This is an IBM RS/6000, 7030-3AT running AIX 5.1L.
-# AIX $hostname 2 5 $serialnumber 5.2.0.0 IBM,7026-H70
+# AIX 2 5 5.2.0.0 IBM,7026-H70
+# AIX Version 05.02.0000.0030
 Fingerprint IBM AIX 5.1 or 5.2
 Class IBM | AIX | 5.X | general purpose
 SEQ(SP=FD-10C%GCD=<7%ISR=F9-111%TI=I%TS=U)
@@ -8590,7 +8586,7 @@ T5(R=Y%DF=N%T=3C%TG=3C%W=0%S=Z%A=O|S+%F=AR%O=%RD=0%Q=)
 T6(R=Y%DF=N%T=3C%TG=3C%W=0%S=A|O%A=Z%F=R%O=%RD=0%Q=)
 T7(R=Y%DF=N%T=3C%TG=3C%W=0%S=Z%A=O|S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FF%TG=FF%TOS=0%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
+IE(DFI=S%T=FF%TG=FF%TOSI=S|Z%CD=S%SI=S%DLI=S)
 
 # AIX s1421a 2 5 000F745C4C00
 Fingerprint IBM AIX 5.2
@@ -8826,9 +8822,10 @@ IE(DFI=S%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 # AIX 5.3 IBM B50
 # IBM AIX 5300-05 on p570
 # IBM F50 running AIX 5.3 32-bit 5300-05
-Fingerprint IBM AIX 5.3 ML05 on Power5
+# AIX 6.100
+Fingerprint IBM AIX 5.3 - 6.1
 Class IBM | AIX | 5.X | general purpose
-SEQ(SP=FA-108%GCD=<7%ISR=105-10F%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=FA-10A%GCD=<7%ISR=105-10F%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=4470%W2=41A0%W3=4100%W4=4000%W5=40E8%W6=402E)
 ECN(R=Y%DF=Y%T=3C%TG=3C%W=4470%O=M5B4%CC=N%Q=)
@@ -10136,7 +10133,7 @@ IE(DFI=N%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # Linksys WRT54G Version 8 running on 8.00.4 firmware.
 Fingerprint Linksys WRT54G v8 wireless broadband router
-Class Linksys | embedded || broadband router
+Class Linksys | embedded || WAP
 SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=99-A3%TI=I|RD%TS=1)
 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)
@@ -10583,7 +10580,8 @@ IE(DFI=N%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 # generic dual-P4-Xeon server running Linux 2.4.33-ow1.
 # WRT54GL, Linux 2.4.34 #2 Tue Oct 16 13:41:23 CEST 2007 mips unknown, OpenWRT Kamikaze 7.09, r9494
 # Buffalo WHR-G54S running the OpenWRT White Russian 0.9 distribution
-Fingerprint Linksys WRT54G v2, WRT54GL, or WRT54GS v4; or Buffalo WHR-G54S or AirStation WZR-RS-G54 running OpenWrt w/Linux kernel 2.4
+# OpenWRT Kamikaze 7.09 on an Asus wl500gP
+Fingerprint OpenWrt 0.9 - 7.09 (Linux 2.4.30 - 2.4.34)
 Class Linux | Linux | 2.4.X | broadband router
 SEQ(SP=B3-CF%GCD=<7%ISR=C0-D7%TI=Z%II=I%TS=U)
 OPS(O1=M5B4NNSNW0%O2=M5B4NNSNW0%O3=M5B4NW0%O4=M5B4NNSNW0%O5=M5B4NNSNW0%O6=M5B4NNS)
@@ -12571,7 +12569,7 @@ IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.24-gentoo-r3 #6 Mon Mar 17 22:02:40 CET 2008 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
 Fingerprint Linux 2.6.19 - 2.6.24 (Gentoo)
 Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=B4-CE%GCD=<7%ISR=C4-CE%TI=Z%II=I%TS=7)
+SEQ(SP=B4-CE%GCD=<7%ISR=C4-D0%TI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW5|M5B4ST11NW7%O2=M5B4ST11NW5|M5B4ST11NW7%O3=M5B4NNT11NW5|M5B4NNT11NW7%O4=M5B4ST11NW5|M5B4ST11NW7%O5=M5B4ST11NW5|M5B4ST11NW7%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=40%TG=40%W=16D0%O=M5B4NNSNW5|M5B4NNSNW7%CC=N%Q=)
@@ -17074,7 +17072,8 @@ U1(DF=N%T=80%TG=80%TOS=0%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(R=N)
 
 # Microsoft Windows Version 5.1 (Build 2600.xpsp_sp2_gdr.070227-2254:Service Pack 2)
-Fingerprint Microsoft Windows XP SP2
+# Microsoft Windows XP SP3
+Fingerprint Microsoft Windows XP SP2 or SP3
 Class Microsoft | Windows | XP | general purpose
 SEQ(SP=FC-108%GCD=<7%ISR=103-10D%TI=I%TS=0)
 OPS(O1=NNT11|M5B4NW0NNT00NNS%O2=NNT11|M5B4NW0NNT00NNS%O3=NNT11|M5B4NW0NNT00%O4=NNT11|M5B4NW0NNT00NNS%O5=NNT11|M5B4NW0NNT00NNS%O6=NNT11|M5B4NNT00NNS)
@@ -17709,9 +17708,9 @@ IE(DFI=S%T=80%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 # Windows XP Pro Build 2600.xpsp_sp2_gdr.050301-1519 : Service pack 2
 # Microsoft Windows XP MediaCenter Edition (SP2) 5.1.2600
 # Windows 2003 small business server, 5.2 Build 3790.srv03_gdr.050225-1827
-Fingerprint Microsoft Windows XP SP2 or Windows 2003 Small Business Server
+# Windows XP SP3
+Fingerprint Microsoft Windows XP SP2 or SP3
 Class Microsoft | Windows | XP | general purpose
-Class Microsoft | Windows | 2003 | general purpose
 SEQ(SP=DC-10A%GCD=<7%ISR=FC-112%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M4ECNW0NNT00NNS%O2=M4ECNW0NNT00NNS%O3=M4ECNW0NNT00%O4=M4ECNW0NNT00NNS%O5=M4ECNW0NNT00NNS%O6=M4ECNNT00NNS)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -18326,8 +18325,9 @@ T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=O|S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FF%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
-# NetBSD 4.99.4 NetBSD 4.99.4 (E4500) #1: Tue Nov 28 10:25:20 EST 2006 /usr/obj/src-current/sys/arch/i386/compile/E4500 i386
-Fingerprint NetBSD 4.99.4 (x86)
+# NetBSD 4.99.4 NetBSD 4.99.4 (E4500) #1: Tue Nov 28 10:25:20 EST 2006 i386
+# Apple Airport Extreme base station 802.11n
+Fingerprint NetBSD 4.99.4
 Class NetBSD | NetBSD | 4.X | general purpose
 SEQ(SP=D0-DA%GCD=<7%ISR=D6-E0%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M5B4NW0NNT01SNN%O2=M5B4NW0NNT01SNN%O3=M5B4NW0NNT01%O4=M5B4NW0NNT01SNN%O5=M5B4NW0NNT01SNN%O6=M5B4NNT01SNN)
@@ -18533,9 +18533,13 @@ IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # some netgear os... don't know, sorry :( (it IS the netgear wgr 614v6)
 # Netgear WGR614v6 V2.0.19_1.0.19NA
-Fingerprint Netgear WGR614v6 wireless broadband router
+# This is a Netgear WGR614v7, firmware version V2.0.20_1.0.20
+# Netgear WPN824v2
+# Linksys WRT54G
+Fingerprint Linksys WRT54G, or Netgear WGR614v6, WGR614v7, or WPN824v2 wireless broadband router
+Class Linksys | embedded || WAP
 Class Netgear | embedded || WAP
-SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=99-A3%TI=I%II=I%SS=S%TS=1)
+SEQ(SP=13-1E%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=99-A3%TI=I%II=I%SS=S%TS=1)
 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=40%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
@@ -18549,24 +18553,6 @@ T7(R=N)
 U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=G%RUCK=0%RUL=G%RUD=G)
 IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# This is a Netgear WGR614v7, firmware version V2.0.20_1.0.20
-# Netgear WPN824v2
-Fingerprint Netgear WGR614v7 or WPN824v2 wireless broadband router
-Class Netgear | embedded || WAP
-SEQ(SP=13-1D%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=98-A2%TI=I%TS=1)
-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=40%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=40%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=40%TG=40%W=0%S=Z%A=O|S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # ReadyNAS NV+ running RAIDiator 4.00c1-p2 firmware, Linux 2.6.17.8ReadyNAS #1 Mon Dec 17 19:35:18 PST 2007 padre unknown
 # ReadyNAS NV+ - in this specific case, RND4250 running Infrant/Netgear embedded Linux distro - "RAIDiator  4.00c1-p2 [1.00a037]", Linux readynas 2.6.17.8ReadyNAS #1 Mon Dec 17 19:35:18 PST 2007 padre unknown
 Fingerprint Netgear RND4250 ReadyNAS NV+ NAS device (Linux 2.6.17)
@@ -18605,6 +18591,7 @@ IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # NetopiaAnalog ADSL Router 3346N
 # Netopia 3397GPB  VDSL Router OS Version 7.7.1r3
 # Netopia 3347NWG, Software Release        7.6.1r6
+# Netopia 3347NWG Software Version 7.4.2r2
 Fingerprint Netopia 3346N, 3347NWG, or 3397GPB ADSL router
 Class Netopia | embedded || broadband router
 SEQ(SP=F7-109%GCD=<7%ISR=FF-10F%TI=I%II=I%SS=S%TS=U)
@@ -19857,23 +19844,6 @@ T7(R=Y%DF=Y%T=FF%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FF%TG=FF%TOS=0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 
-# QNX 4.24
-Fingerprint QNX 4.24
-Class QNX | QNX | 4.X | general purpose
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=3C%TG=3C%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3C%TG=3C%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3C%TG=3C%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FF%TG=FF%TOS=0%IPL=38%UN=0%RIPL=15C%RID=4210%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
-
 # QNX 6.2.1 x86pc x86 on AMD K6/III 400 MHz
 Fingerprint QNX 6.2.1 (x86)
 Class QNX | QNX | 6.X | general purpose
@@ -22249,7 +22219,8 @@ U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=40%TG=40%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # TANDBERG 990 MXP Video Conferencing Unit
-Fingerprint Tandberg 990 MXP Video Conferencing Unit
+# Tandberg T1000 [TTC7-02] integrated Video Conferencing Unit
+Fingerprint Tandberg 990 or 1000 MXP video conferencing unit
 Class Tandberg | embedded || webcam
 SEQ(SP=FD-109%GCD=<7%ISR=101-111%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
@@ -22923,24 +22894,6 @@ T7(R=Y%DF=N%T=3F%TG=3F%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FE%TG=FE%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=FE%TG=FE%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Xerox Phaser 6350DT Network Printer
-# OS: 5.78; Engine 3.1.0;
-Fingerprint Xerox Phaser 6350DT printer
-Class Xerox | embedded || printer
-SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=N%T=40%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=40%TG=40%W=2000%S=O%A=O%F=A%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=40%TG=40%W=2000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=40%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
-
 # Xerox Phaser 8560MFP, Operating System: 8.26, Networking: 33.16.05.04.2007
 Fingerprint Xerox Phaser 8560 multifunction printer
 Class Xerox | embedded || printer
@@ -25038,3 +24991,71 @@ T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
 T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FF%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
+
+# NetworksAOK appliance made by http://www.interloci.com/
+Fingerprint NetworksAOK network monitoring applicance
+Class NetworksAOK | embedded || firewall
+SEQ(SP=C8-D2%GCD=<7%ISR=CE-D8%TI=Z%TS=7)
+OPS(O1=M584ST11NW0%O2=M584ST11NW0%O3=M584NNT11NW0%O4=M584ST11NW0%O5=M584ST11NW0%O6=M584ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=40%TG=40%W=16D0%O=M584NNSNW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=40%TG=40%S=O%A=O|S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=N%T=80%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+U1(R=N)
+IE(R=N)
+
+# Linux 2.6.24-reiser4-r3 #1 Fri Mar 14 14:34:25 CET 2008 i686 Intel(R) Pentium(R) M processor 1.60GHz GenuineIntel GNU/Linux / Gentoo Linux
+Fingerprint Linux 2.6.24
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(R=N)
+OPS(R=N)
+WIN(R=N)
+ECN(R=Y%DF=Y%T=40%TG=40%W=8018%O=M400CNNSNW6%CC=N%Q=)
+T1(R=N)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
+# Linux 2.6.18-5-486 i586 GNU/Linux
+Fingerprint Linux 2.6.18
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=C2-CC%GCD=<7%ISR=C7-D1%TI=Z%II=I%TS=8)
+OPS(O1=M5B4ST11NW1%O2=M5B4ST11NW1%O3=M5B4NNT11NW1%O4=M5B4ST11NW1%O5=M5B4ST11NW1%O6=M5B4ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=Y%T=3D%TG=3D%W=16D0%O=M5B4NNSNW1%CC=N%Q=)
+T1(R=Y%DF=Y%T=3D%TG=3D%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=3D%TG=3D%W=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW1%RD=0%Q=)
+T4(R=Y%DF=Y%T=3D%TG=3D%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3D%TG=3D%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3D%TG=3D%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3D%TG=3D%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=3D%TG=3D%TOSI=S%CD=S%SI=S%DLI=S)
+
+# Linux 2.6.5-7.202.7-smp #1 SMP Tue Nov 29 14:32:53 UTC 2005 x86_64 x86_64 x86_64 GNU/Linux
+Fingerprint Linux 2.6.5
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=B8-C2%GCD=<7%ISR=BD-C7%TI=Z%II=I%TS=U)
+OPS(O1=M400CNNSNW0%O2=M400CNNSNW0%O3=M400CNW0%O4=M400CNNSNW0%O5=M400CNNSNW0%O6=M400CNNS)
+WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
+ECN(R=Y%DF=Y%T=40%TG=40%W=7FFF%O=M400CNNSNW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=40%TG=40%W=7FFF%S=O%A=S+%F=AS%O=M400CNNSNW0%RD=0%Q=)
+T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)