diff --git a/nmap-os-db b/nmap-os-db
index 0f3a6bfe6..e1a097271 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -179,7 +179,9 @@ IE(DFI=N%T=FA-104%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
 # Xerox Phaser 3125/N network printer
-Fingerprint 3Com SuperStack 3 Switch 4300, Samsung ML-2571N printer, or Xerox Phaser 3125N printer
+# Samsung 6555N Scanner/Printer/Copier
+# VxWorks? -- Ed.
+Fingerprint 3Com SuperStack 3 Switch 4300, Samsung ML-2571N or 6555N printer, or Xerox Phaser 3125N printer
 Class 3Com | embedded || switch
 Class Samsung | embedded || printer
 Class Xerox | embedded || printer
@@ -386,7 +388,7 @@ U1(DF=N%T=3B-45%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Acorp-W422G, wireless ADSL router.
-# Linux version 2.4.17_mvl21-malta-mips_fp_le (root@home1.homework) (gcc version 2.95.3 20010315 (release/MontaVista)) #1 Sat Sep 8 00:03:33 MSD 2007, Acorp-W400G ADSL and Wi-Fi router,
+# Linux 2.4.17_mvl21-malta-mips_fp_le (root@home1.homework) (gcc version 2.95.3 20010315 (release/MontaVista)) #1 Sat Sep 8 00:03:33 MSD 2007, Acorp-W400G ADSL and Wi-Fi router,
 Fingerprint Acorp W400G or W422G wireless ADSL modem (MontaVista embedded Linux 2.4.17)
 Class Acorp | embedded || WAP
 SEQ(SP=C2-CC%GCD=<7%ISR=C7-D1%TI=Z%II=I%TS=7)
@@ -471,7 +473,9 @@ IE(DFI=N%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 # vmware entreprise ESX server 3.5
 # Linux 2.4.31 #5 SMP Mon Jun 12 14:51:36 CDT 2006 i686 pentium4 i386 GNU/Linux Slackware 10.2
 # Linksys WRT54G (WLAN access point)
-Fingerprint Linux 2.4.22 - 2.4.31 (likely embedded)
+# Redhat Fedora Core 1  2.4.22-1.2199.8.legacy.nptl  i686 i686 i386 GNU/Linux
+# Linux 2.4.21-47.0.1.ELvmnix #1 Tue Mar 18 18:07:00 PDT 2008 i686 i686 i386 GNU/Linux (VMware ESX Server 3.5.0 build-82663)
+Fingerprint Linux 2.4.21 - 2.4.31 (likely embedded)
 Class Linux | Linux | 2.4.X | general purpose
 SEQ(SP=B5-D1%GCD=<7%ISR=C6-DA%TI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
@@ -577,9 +581,11 @@ IE(DFI=N%T=1B-25%TG=20%TOSI=S%CD=S%SI=S%DLI=S)
 # D-Link DI-604, firmware 3.52
 # airnet awr014g
 # D-Link Wbr-2310, Hardware Version: A1, Firmware Version: 1.01
-Fingerprint D-Link WAP (DI-524, DI-604, DI-624, or WBR-2310), or Airnet AWR014G WAP
+# Trendnet TEW 432brp, H/W B2.1R
+Fingerprint WAP: Airnet AWR014G; D-Link DI-524, DI-604, DI-624, or WBR-2310; or TRENDnet TEW-432BRP
 Class Airnet | embedded || WAP
 Class D-Link | embedded || WAP
+Class TRENDnet | embedded || WAP
 SEQ(SP=B-15%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B|5DEFA%ISR=96-A0%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B0%O2=M5B0%O3=M5B0%O4=M5B0%O5=M5B0%O6=M5B0)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -710,12 +716,14 @@ IE(DFI=S%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Aastra 9133i IP Phone firmware version 1.4.1.1077
 # Canon iR2570CI
 # Aastra 480i GT
+# Scopus IVG-7100 - Intelligent Video Remultiplexer
 # Maybe all these are VxWorks? -- Ed.
 # Class Aastra | embedded || VoIP phone
 # Class Allen-Bradley | embedded || specialized
 # Class Harmonic | embedded || specialized
+# Class Scopus | embedded || media device
 # Class Sony | embedded || media device
-Fingerprint Aastra 480i GT or 9133i IP phone, Allen-Bradley ControlLogix 1756-EWEB web server module, Canon imageRUNNER 2570Ci printer, Compex WPE54G WAP, Harmonic MaxLink HLT 7806R optical network transmitter, Hitachi WMS 100 SAN controller, Inter-tel 8662 VoIP phone, Netgear SC101 Storage Central NAS device, Sony LocationFree media server, or Xerox Phaser 6120/N printer
+Fingerprint Aastra 480i GT or 9133i IP phone, Allen-Bradley ControlLogix 1756-EWEB web server module, Canon imageRUNNER 2570Ci printer, Compex WPE54G WAP, Harmonic MaxLink HLT 7806R optical network transmitter, Hitachi WMS 100 SAN controller, Inter-tel 8662 VoIP phone, Netgear SC101 Storage Central NAS device, Sony LocationFree media server, Scopus IVG-7100 media server, or Xerox Phaser 6120/N printer
 Class Canon | embedded || printer
 Class Compex | embedded || WAP
 Class Hitachi | embedded || storage-misc
@@ -1842,23 +1850,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUL=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Darwin 9.1.0 Darwin Kernel Version 9.1.0: Wed Oct 31 17:48:21 PDT 2007; root:xnu-1228.0.2~1/RELEASE_PPC Power Macintosh
-Fingerprint Apple Mac OS X 10.5 (Leopard) (Darwin 9.1.0, PowerPC)
-Class Apple | Mac OS X | 10.5.X | general purpose
-SEQ(SP=F8-102%GCD=<7%ISR=FB-10F%TI=RD%II=RI%TS=3)
-OPS(O1=M3FD8NW3NNT11SLL%O2=M3FD8NW3NNT11SLL%O3=M3FD8NW3NNT11%O4=M3FD8NW3NNT11SLL%O5=M3FD8NW3NNT11SLL%O6=M3FD8NNT11SLL)
-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=M3FD8NW3SLL%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=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=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%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Darwin 9.2.2 Darwin Kernel Version 9.2.2: Tue Mar  4 21:17:34 PST 2008; root:xnu-1228.4.31~1/RELEASE_I386 i386
 Fingerprint Apple Mac OS X 10.5 (Leopard) (Darwin 9.2.2, x86)
 Class Apple | Mac OS X | 10.5.X | general purpose
@@ -1876,6 +1867,7 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUL=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
+# Darwin 9.1.0 Darwin Kernel Version 9.1.0: Wed Oct 31 17:48:21 PDT 2007; root:xnu-1228.0.2~1/RELEASE_PPC Power Macintosh
 # Darwin 9.0.0 Darwin Kernel Version 9.0.0: Tue Oct  9 21:35:55 PDT 2007; root:xnu-1228~1/RELEASE_I386 i386
 # Mac OS 10.5 leopard 9A581
 # Darwin 9.0.0 Darwin Kernel Version 9.0.0: Tue Oct  9 21:37:58 PDT 2007; root:xnu-1228~1/RELEASE_PPC Power Macintosh
@@ -2053,10 +2045,12 @@ IE(DFI=Y%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
 # Apple AirPort Extreme (802.11a/b/g/draft-n), Apple P/N A1143, S/W ver 7.0
 # Apple Airport Extreme 7.1.1
-# (Runs NetBSD 4.99?)
-Fingerprint Apple AirPort Extreme 7.0 - 7.3.2 WAP (NetBSD)
-Class Apple | NetBSD | 4.X | WAP
-SEQ(SP=CB-D5%GCD=<7%ISR=D7-E1%TI=I%II=I%SS=S%TS=0)
+# 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
+# Apple Time Capsule NAS device
+Fingerprint NetBSD 4.99.4
+Class NetBSD | NetBSD | 4.X | general purpose
+SEQ(SP=CB-DA%GCD=<7%ISR=D6-E1%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M5B4NW0NNT01SNN%O2=M5B4NW0NNT01SNN%O3=M5B4NW0NNT01%O4=M5B4NW0NNT01SNN%O5=M5B4NW0NNT01SNN%O6=M5B4NNT01SNN)
 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=M5B4NW0SNN%CC=N%Q=)
@@ -2068,7 +2062,7 @@ 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%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
+IE(DFI=N%T=FA-104%TG=FF%TOSI=S|Z%CD=S%SI=S%DLI=S)
 
 # Personal Multimedia Player archos 605 WiFi 4G/30G/80G/160G, Firmware 1.7.13
 Fingerprint Archos 605 WiFi video player
@@ -2180,7 +2174,8 @@ U1(DF=N%T=FA-104%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G
 IE(DFI=N%T=FA-104%TG=FF%TOSI=C0%CD=S%SI=S%DLI=S)
 
 # Audiocodes MP-118-4FXS4FXO VoIP Gate
-Fingerprint Audiocodes MP-118-4FXS4FXO VoIP gateway
+# Audiocodes MP-114 FXO
+Fingerprint Audiocodes MP-114 or MP-118 VoIP gateway
 Class AudioCodes | embedded || VoIP gateway
 SEQ(SP=C-16%GCD=1E848|3D090|5B8D8|7A120|98968%ISR=9F-A9%TS=A)
 OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
@@ -4038,7 +4033,9 @@ IE(DFI=S%T=3B-45%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
 # Compaq Remote Insight Lights-Out Edition II
 # Cisco Wireless Access Point, AIR-AP1010-E-K9,  Software Version 4.0.206.0
 # Sun(tm) Advanced Lights Out Manager 1.2
-Fingerprint WAP (Cisco Aironet 1010, Linksys WAP51AB or WAP55AG, Netgear WPN824, or Proxim ORiNOCO AP-4000M), Lights-Out remote server management, or ReplayTV 5500 DVR
+# D-Link DWL-2100AP running Atheros Access Point Rev 4.0.0.167 firmware
+Fingerprint WAP (Cisco Aironet 1010, D-Link DWL-2100AP, Linksys WAP51AB or WAP55AG, Netgear WPN824, or Proxim ORiNOCO AP-4000M), Lights-Out remote server management, or ReplayTV 5500 DVR
+Class D-Link | embedded || WAP
 Class Cisco | embedded || WAP
 Class Compaq | embedded || remote management
 Class HP | embedded || remote management
@@ -4119,23 +4116,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=O|S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Cisco IOS 12.2(2)XA1, EARLY DEPLOYMENT; Running on Cisco cable modem
-Fingerprint Cisco uBR 925 cable modem (runs IOS 12.2)
-Class Cisco | IOS | 12.X | broadband router
-SEQ(SP=FF-109%GCD=<7%ISR=FF-10F%TI=Z%II=RI%TS=U)
-OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FC-106%TG=FF%W=1020%O=M218%CC=N%Q=)
-T1(R=Y%DF=N%T=FC-106%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FC-106%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FC-106%TG=FF%W=1020%S=O%A=S+%F=AS%O=M218%RD=0%Q=)
-T4(R=Y%DF=N%T=FC-106%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FC-106%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FC-106%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FC-106%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FC-106%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=FC-106%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Cisco 1811 Router, IOS 12.4(6)T6
 # Cisco IOS Software, 2800 Software (C2800NM-ADVIPSERVICESK9-M), Version 12.4(11)T2
 Fingerprint Cisco 1811 or 2800 router (IOS 12.4)
@@ -4449,30 +4429,19 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
+# Cisco WS-C2960G-24TC-L, Version 12.2(25)SEE1
+# Cisco IOS 12.2(2)XA1, EARLY DEPLOYMENT; Running on Cisco cable modem
+# Cisco WS-C3750G-48TS-S  Version 12.2(25r)SE1
 # Cisco 3750 running Version 12.2(25r)SE1
 # Cisco IOS Software, C3560 Software (C3560-IPBASE-M), Version 12.2(25)SEB4, RELEASE SOFTWARE (fc1)
 # IOS (tm) C2950 Software (C2950-I6K2L2Q4-M), Version 12.1(22)EA8a, RELEASE SOFTWARE (fc1)
 # cisco WS-C2950T-24, System image file is "flash:c2950-i6k2l2q4-mz.121-22.EA9.bin"
-Fingerprint Cisco 2950, 3560, or 3750 switch (IOS 12.1 - 12.2)
+# 7200 Software (C7200-BOOT-M), Version 12.0(17)S, EARLY DEPLOYMENT RELEASE SOFTWARE (fc1) (7206VXR router)
+Fingerprint Cisco 2900-series, 3650, or 3750 switch; 7206VXR router; or uBR 925 cable modem (IOS 12.1 - 12.2)
+Class Cisco | IOS | 12.X | router
 Class Cisco | IOS | 12.X | switch
-SEQ(SP=C4-106%GCD=<7%ISR=104-10E%TI=Z%II=RI%TS=U)
-OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=F9-104%TG=FF%W=1020%O=M218%CC=N%Q=)
-T1(R=Y%DF=N%T=F9-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=F9-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=F9-104%TG=FF%W=1020%S=O%A=S+%F=AS%O=M218%RD=0%Q=)
-T4(R=Y%DF=N%T=F9-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=F9-104%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=F9-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=F9-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=F9-104%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=F9-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
-
-# Cisco WS-C2960G-24TC-L, Version 12.2(25)SEE1
-Fingerprint Cisco 2960G switch (IOS 12.2)
-Class Cisco | IOS | 12.X | switch
-SEQ(SP=101-10D%GCD=<7%ISR=107-111%TI=Z%II=RI%TS=U)
+Class Cisco | IOS | 12.X | broadband modem
+SEQ(SP=101-10D%GCD=<7%ISR=FF-111%TI=Z%II=RI%TS=U)
 OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M109)
 WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M218%CC=N%Q=)
@@ -4483,8 +4452,8 @@ 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=A%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=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
+U1(DF=N%T=FA-104%TG=FF%TOS=0|C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%TOSI=S|Z%CD=S%SI=S%DLI=S)
 
 # Cisco 3548XL switch, IOS 12.0(5)WC16 Enterprise Edition
 Fingerprint Cisco 3548XL switch (IOS 12.0)
@@ -4652,23 +4621,6 @@ T7(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FB-105%TG=FF%TOS=D0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(R=N)
 
-# Cisco WS-C3750G-48TS-S  Version 12.2(25r)SE1
-Fingerprint Cisco Catalyst 3750 switch (IOS 12.2)
-Class Cisco | IOS | 12.X | switch
-SEQ(SP=F0-10D%GCD=<7%ISR=102-111%TI=Z%II=RI%TS=U)
-OPS(O1=|M218%O2=|M218%O3=|M218%O4=|M218%O5=|M218%O6=|M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FB-105%TG=FF%W=1020%O=|M218%CC=N%Q=)
-T1(R=Y%DF=N%T=FB-105%TG=FF%S=O%A=O|S+%F=A|AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FB-105%TG=FF%W=1020%S=O%A=O|S+%F=A|AS%O=|M218%RD=0%Q=)
-T4(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FB-105%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FB-105%TG=FF%TOS=C0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=FB-105%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Cisco IOS Software, C2960 Software (C2960-LANBASE-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
 # Cisco IOS Version 12.2(18)SXF8 running on Supervisor II / MSFC II module in a Cisco Catalyst 6500 switch
 # Cisco WS-C3560-48PS
@@ -4855,11 +4807,10 @@ IE(DFI=N%T=FA-104%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 # Cisco C1230B running vxWorks 12.01T1
 # Cisco 1200 Series AP 12.01T1 (AIR-AP-1220B-E-K9) running VxWorks 12.01A
 # Remote System Controller (RSC) card of a Sun Fire 280R server, RSC Version: 2.2.3
-Fingerprint Cisco 1200-series WAP, HP ProCurve 2650 switch, Sun Remote System Control (RSC), or Xerox Phaser 7400N or 8550DT printer
-Class Cisco | VxWorks | 12.X | WAP
-Class HP | embedded || switch
-Class Sun | embedded || specialized
-Class Xerox | embedded || printer
+# Nortel Ethernet Switch 470-48T-PWR. FW:3.6.0.6   SW:v3.6.3.04 ISVN:2.
+# 3COM wireless Access Point 7250
+Fingerprint VxWorks 12.0
+Class VxWorks | VxWorks | 12.X | general purpose
 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)
@@ -5299,8 +5250,10 @@ U1(DF=N%T=7A-84%TG=80%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=7A-84%TG=80%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # DWL-900AP+ Wireless Access Point
-Fingerprint D-Link DWL-900AP+ WAP
+# USRobotics USR5450 802.11g Wireless Turbo Multi-Function Access Point. Running firmware version 1.53b10.
+Fingerprint D-Link DWL-900AP+ or USRobotics USR5450 WAP
 Class D-Link | embedded || WAP
+Class USRobotics | embedded || WAP
 SEQ(SP=B-15%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B|5DEFA%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=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -5388,8 +5341,10 @@ IE(DFI=N%T=91-9B%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # D-Link DSL-G624T ADSL Router, Linux version 2.4.17_mvl21-malta-mips_fp_le (root@Jackal) (gcc version 2.95.3 20010315 (release/MontaVista))
 # DG834G V4.01.19
-Fingerprint D-Link DSL-G624T wireless ADSL router (MontaVista embedded Linux 2.4.17) or Netgear DG834G WAP (firmware 4.01.19)
+# ADSL Modem Router Netgear DG834Bv3 V4.01.27
+Fingerprint D-Link DSL-G624T wireless ADSL router (MontaVista embedded Linux 2.4.17), or Netgear DG834Bv3 ADSL router or DG834G WAP
 Class D-Link | Linux | 2.4.X | WAP
+Class Netgear | embedded || broadband router
 Class Netgear | embedded || WAP
 SEQ(SP=C4-CE%GCD=<7%ISR=C9-D3%TI=Z%II=I%TS=7|8|9)
 OPS(O1=NNT11|M5B4ST11NW0%O2=NNT11|M5B4ST11NW0%O3=NNT11|M5B4NNT11NW0%O4=NNT11|M5B4ST11NW0%O5=NNT11|M5B4ST11NW0%O6=NNT11|M5B4ST11)
@@ -5702,7 +5657,7 @@ T4(R=Y%DF=N%T=19-23%TG=20%W=2000%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=19-23%TG=20%TOS=0%IPL=38%UN=0|50|2AE2|A930|FFFF%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+U1(DF=N%T=19-23%TG=20%TOS=0%IPL=38%UN=50|2AE2|A930|FFFF%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=19-23%TG=20%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # Dell Powervault 132T tape library
@@ -7843,7 +7798,9 @@ U1(DF=N%T=3B-45%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUL=G%RUD
 IE(DFI=S%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # HP 9100c Digital Sender  (scanner)
-Fingerprint HP 9100c Digital Sender multifunction printer
+# HP ProCurve Switch 2524
+Fingerprint HP ProCurve 2524 switch or 9100c Digital Sender printer
+Class HP | embedded || switch
 Class HP | embedded || printer
 SEQ(R=N)
 OPS(R=N)
@@ -7929,7 +7886,8 @@ IE(DFI=N%T=FA-104%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 # HP LaserJet 1022n printer
 # Brother HL-5250DN, Printer firmware version 1.07, Network firmware version 1.01
 # Brother MFC-8860DN.
-Fingerprint HP LaserJet (1020-, 2010-, 2600-, 2800-, 3050-, or 3390-series), or Brother HL-5250DN or MFC-8860DN printer
+# Brother MFC-7840N, firmware version F, sub-firmware version 1.00, and NC-6600h print server firmware version 1.02.
+Fingerprint HP LaserJet (1020-, 2010-, 2600-, 2800-, 3050-, or 3390-series), or Brother (HL-5250DN, MFC-7840N, or MFC-8860DN) printer
 Class HP | embedded || printer
 Class Brother | embedded || printer
 SEQ(SP=0-16%GCD=1E848|3D090|5B8D8|7A120|98968|B71B0%ISR=9F-A9%TI=I%II=I%SS=S%TS=A)
@@ -7982,7 +7940,8 @@ IE(DFI=S%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # hp LaserJet 1320 series, Formatter Number: E7206LL, Service ID: 16053, Firmware Datecode: 20041024, Network Statistics Firmware Version: V.28.05
 # HP LaserJet 2550N Color LaserJet
-Fingerprint HP LaserJet 1320 or 2550n printer
+# Deskjet 1220C
+Fingerprint HP DeskJet 1220, or LaserJet 1320 or 2550n printer
 Class HP | embedded || printer
 SEQ(SP=94-9E%GCD=<7%ISR=9B-A5%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -8148,7 +8107,8 @@ IE(DFI=N%T=37-41%TG=40%TOSI=Z%CD=Z%SI=S%DLI=S)
 # hp LaserJet 4200       Printer Model: Q2426A     Firmware Datecode: 20030530 04.016.1
 # HP LaserJet 4050 series printer
 # HP LaserJet 5100 Series printer (J7934A), Firmware Version:  V.28.06
-Fingerprint HP LaserJet 4050/4200/4600/5100 (JetDirect) printer
+# HP Laserjet 3330
+Fingerprint HP LaserJet 3330/4050/4200/4600/5100 printer
 Class HP | embedded || printer
 SEQ(SP=95-9F%GCD=<7%ISR=9B-A5%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -9304,9 +9264,10 @@ IE(DFI=S%T=7B-85%TG=80%TOSI=S%CD=Z%SI=S%DLI=S)
 # ZyXel Prestige 623ME-T1 ADSL dual link router
 # Huawei SmartAX MT800u-T
 # ZyXEL Prestige 2602R-61
-Fingerprint Huawei MT800u-T, or ZyXEL Prestige 623ME-T1 or 2602R-61 ADSL router
+# Zyxel Prestige 782R, firmware ZyNOS 2.50(BH.4) | 8/6/2002
+Fingerprint Huawei MT800u-T; or ZyXEL Prestige 623ME-T1, 782, or 2602R-61 ADSL router
 Class Huawei | embedded || broadband router
-Class ZyXEL | ZyNOS || broadband router
+Class ZyXEL | ZyNOS | 2.X | broadband router
 SEQ(SP=0-31%GCD=1000|2000|3000|4000|5000|A000|14000|1E000|28000|32000|3C000|64000|C8000|12C000|190000|1F4000|258000%ISR=AB-B5%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M200%O2=M200%O3=M200%O4=M200%O5=M200%O6=M200)
 WIN(W1=400%W2=400%W3=400%W4=400%W5=400%W6=400)
@@ -9709,8 +9670,10 @@ U1(DF=N%T=FA-104%TG=FF%TOS=0%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUL=G%RUD
 IE(DFI=S%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 
 # AIX 5L V5.3 (4/2008) - freshly installed, AIX 3 5 00CFFBA14C00
-Fingerprint IBM AIX 5.3
+# IBM AIX 6.1.0.0
+Fingerprint IBM AIX 5.3 - 6.1
 Class IBM | AIX | 5.X | general purpose
+Class IBM | AIX | 6.X | general purpose
 SEQ(SP=FF-109%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=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -10224,23 +10187,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%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# NIOS version 4.1r5
-Fingerprint Infoblox NIOS 4.1r5
-Class Infoblox | NIOS | 4.X | specialized
-SEQ(SP=C8-D2%GCD=<7%ISR=C7-D1%TI=Z%II=I%TS=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%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%TOS=0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
-
 # Infoblox NIOS Release 4.1r2-5-22263
 Fingerprint Infoblox NIOS Release 4.1r2-5-22263
 Class Infoblox | NIOS | 4.X | specialized
@@ -10294,7 +10240,8 @@ IE(R=N)
 
 # Intel Express 510T Switch
 # Intel Express 550T Routing Switch, firmware 2.76
-Fingerprint Intel Express 510T or 550T switch
+# Intel Express 520T Routing Switch, firmware 2.76
+Fingerprint Intel Express 510T, 520T, or 550T switch
 Class Intel | embedded || switch
 SEQ(SP=F-19%GCD=10|20|30|40|50%ISR=4B-55%TI=I%TS=U)
 OPS(O1=M58C%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
@@ -10675,7 +10622,9 @@ U1(R=N)
 IE(DFI=N%T=7B-85%TG=80%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # Konica Minolta Bizhub C450 with Default Emperon Controller
-Fingerprint Konica Minolta Bizhub C450 copier with (default) Emperon Controller
+# HP ProCurve 2650 (Product number: HP J4899B)
+Fingerprint HP ProCurve 2650 switch or Konica Minolta Bizhub C450 copier
+Class HP | embedded || switch
 Class Konica Minolta | embedded || printer
 SEQ(SP=13-1D%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=98-A2%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -11931,23 +11880,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%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Redhat Fedora Core 1  2.4.22-1.2199.8.legacy.nptl  i686 i686 i386 GNU/Linux
-Fingerprint Linux 2.4.22 (Fedora Core 1, x86)
-Class Linux | Linux | 2.4.X | general purpose
-SEQ(SP=C3-CD%GCD=<7%ISR=C7-D1%TI=Z%II=I%TS=7)
-OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
-WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
-ECN(R=Y%DF=Y%T=3C-46%TG=40%W=16D0%O=M5B4NNSNW0%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=N)
-T4(R=Y%DF=Y%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3C-46%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3C-46%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=3C-46%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3C-46%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Linux 2.4.22-1.2199.8.legacy.nptl #1 Fri Mar 3 22:50:22 EST 2006 i686 i686 i386 GNU/Linux
 Fingerprint Linux 2.4.22 (x86)
 Class Linux | Linux | 2.4.X | general purpose
@@ -12791,15 +12723,16 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.20-15-server #2 SMP Sun Apr 15 07:41:34 UTC 2007 i686 GNU/Linux [Ubuntu Server 7.04]
 # Linux gentoo 2.6.23-gentoo-r8 #1 SMP Mon Mar 10 19:09:47 UTC 2008 i686 Genuine Intel(R) CPU 2140 @ 1.60GHz GenuineIntel GNU/Linux
 # Linux 2.6.25.9 #3 Wed Jun 25 18:54:09 CEST 2008 i686 GNU/Linux  -- Debian 4.3.1-2
-Fingerprint Linux 2.6.17 - 2.6.20
+# Linux 2.6.24-zen1 #31 SMP PREEMPT Fri Feb 1 11:55:03 EST 2008 x86_64 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+ AuthenticAMD GNU/Linux
+Fingerprint Linux 2.6.17 - 2.6.24
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=BC-D2%GCD=<7%ISR=BE-D6%TI=Z%II=I%TS=7)
-OPS(O1=M400CST11NW1|M400CST11NW3|M400CST11NW4%O2=M400CST11NW1|M400CST11NW3|M400CST11NW4%O3=M400CNNT11NW1|M400CNNT11NW3|M400CNNT11NW4%O4=M400CST11NW1|M400CST11NW3|M400CST11NW4%O5=M400CST11NW1|M400CST11NW3|M400CST11NW4%O6=M400CST11)
+OPS(O1=M400CST11NW1|M400CST11NW2|M400CST11NW3|M400CST11NW4|M400CST11NW6%O2=M400CST11NW1|M400CST11NW2|M400CST11NW3|M400CST11NW4|M400CST11NW6%O3=M400CNNT11NW1|M400CNNT11NW2|M400CNNT11NW3|M400CNNT11NW4|M400CNNT11NW6%O4=M400CST11NW1|M400CST11NW2|M400CST11NW3|M400CST11NW4|M400CST11NW6%O5=M400CST11NW1|M400CST11NW2|M400CST11NW3|M400CST11NW4|M400CST11NW6%O6=M400CST11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW1|M400CNNSNW3|M400CNNSNW4%CC=N%Q=)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW1|M400CNNSNW2|M400CNNSNW3|M400CNNSNW4|M400CNNSNW6%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=8000%S=O%A=S+%F=AS%O=M400CST11NW1|M400CST11NW3|M400CST11NW4%RD=0%Q=)
+T3(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M400CST11NW1|M400CST11NW2|M400CST11NW3|M400CST11NW4|M400CST11NW6%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=)
@@ -12810,7 +12743,8 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Centos 4.3 Linux 2.6.17.11-grsec #1 Sat Sep 16 06:39:06 EDT 2006 i686 athlon i386 GNU/Linux
 # CentOS 4.4 Linux 2.6.17.11 (CentOS 4.4, x86, custom compiled kernel)
 # Linux 2.6.20-16-generic #2 SMP Sun Sep 23 19:50:39 UTC 2007 i686 GNU/Linux
-Fingerprint Linux 2.6.17 - 2.6.20
+# Linux 2.6.22-1-mepis-smp #1 SMP PREEMPT Mon Feb 18 21:44:02 EST 2008 i686 GNU/Linux
+Fingerprint Linux 2.6.17 - 2.6.22
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=A5-D5%GCD=<7%ISR=A7-D7%TI=Z%II=I%TS=U)
 OPS(O1=M400C%O2=M400C%O3=M400C%O4=M400C%O5=M400C%O6=M400C)
@@ -13615,7 +13549,8 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.19.2 mips (OpenWrt Kamikaze on 'la fonera' wireless ap)
 # Linux 2.6.19.2 #1 Tue Jun 5 10:59:31 CDT 2007 i586 unknown
 # Linux 2.6.21.5 #2 Sun Sep 30 20:16:16 CEST 2007 mips unknown / OpenWrt Kamikaze 7.09 (Atheros) (La Fonera 2100)
-Fingerprint Linux 2.6.19 - 2.6.21
+# 2.6.24-19 (Ubuntu 8.04)
+Fingerprint Linux 2.6.19 - 2.6.24
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=C0-CC%GCD=<7%ISR=C0-D6%TI=Z%II=I%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
@@ -13810,29 +13745,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Linux 2.6.18 (custom compiled) Debian 3.1 (sid)
-# Linux 2.6.18.3 (i686 customizado)
-# Linux 2.6.20-15-server #2 SMP Sun Apr 15 07:41:34 UTC 2007 i686 GNU/Linux Ubuntu Fiesty
-# Linux 2.6.20-15-server Ubuntu Server 7
-#  Linux 2.6.20-16-server #2 SMP Thu Jun 7 20:26:23 UTC 2007 i686 GNU/LinuxUbuntu 7.04
-# Linux 2.6.20-15-server #2 SMP Sun Apr 15 07:41:34 UTC 2007 i686 GNU/Linux
-# Linux 2.6.24-zen1 #31 SMP PREEMPT Fri Feb 1 11:55:03 EST 2008 x86_64 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+ AuthenticAMD GNU/Linux
-Fingerprint Linux 2.6.18 - 2.6.24
-Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=BA-CB%GCD=<7%ISR=C4-D3%TI=Z%II=I%TS=7)
-OPS(O1=M400CST11NW2|M400CST11NW6%O2=M400CST11NW2|M400CST11NW6%O3=M400CNNT11NW2|M400CNNT11NW6%O4=M400CST11NW2|M400CST11NW6%O5=M400CST11NW2|M400CST11NW6%O6=M400CST11)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW2|M400CNNSNW6%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=8000%S=O%A=S+%F=AS%O=M400CST11NW2|M400CST11NW6%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%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Linux 2.6.20-1 (Fedora Core 5)
 Fingerprint Linux 2.6.20-1 (Fedora Core 5)
 Class Linux | Linux | 2.6.X | general purpose
@@ -13969,23 +13881,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Linux 2.6.21-2-686 #1 SMP Wed Jul 11 03:53:02 UTC 2007 i686 GNU/Linux / Debian Sid
-Fingerprint Linux 2.6.21 (Debian, x86)
-Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=C2-CC%GCD=<7%ISR=C2-CC%TI=Z%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=Y%T=3B-45%TG=40%W=16D0%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=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%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(R=N)
-
 # Linux 2.6.21.5 / Slackware 12.0
 Fingerprint Linux 2.6.21 (Slackware 12.0)
 Class Linux | Linux | 2.6.X | general purpose
@@ -14059,7 +13954,7 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.22.5-31-default #1 SMP 2007/09/21 22:29:00 UTC i686 i686 i386 GNU/Linux; openSuSE 10.3 i386
 # Linux 2.6.22.8 #1 PREEMPT Tue Sep 25 13:53:48 CEST 2007 i686 GNU/Linux
 # Linux 2.6.23-rc6 SMP PREEMPT
-# Linux version 2.6.22-14-generic (buildd@terranova) (gcc version 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2))
+# Linux 2.6.22-14-generic (buildd@terranova) (gcc version 4.1.3 20070929 (prerelease) (Ubuntu 4.1.2-16ubuntu2))
 Fingerprint Linux 2.6.22
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=A2-D8%GCD=<7%ISR=E9-FF%TI=Z%II=I%TS=8)
@@ -14549,7 +14444,7 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # Linux 2.6.22.1-32.fc6 #1 SMP Wed Aug 1 15:15:33 EDT 2007 i686 i686 i386 GNU/Linux (Fedora Core 6 (Zod))
 # Linux 2.6.22.9-61.fc6 #1 SMP Thu Sep 27 18:48:03 EDT 2007 i686 i686 i386 GNU/Linux
-# Linux localhost 2.6.22.2-42.fc6 #1 SMP Wed Aug 15 12:34:26 EDT 2007 i686 i686 i386 GNU/Linux
+# Linux 2.6.22.2-42.fc6 #1 SMP Wed Aug 15 12:34:26 EDT 2007 i686 i686 i386 GNU/Linux
 Fingerprint Linux 2.6.22 (Fedora Core 6)
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=D0-DA%GCD=<7%ISR=EA-F4%TI=Z%II=I%TS=A)
@@ -15324,7 +15219,7 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.8-11-amd64-generic #1 Sat Jul 1 10:42:22 UTC 2006 x86_64 GNU/Linux
 # Xerox DocuColor 250
 # Linux 2.6.5-1.358 #1 Sat May 8 09:04:50 EDT 2004 i686 i686 i386 GNU/Linux / Fedora Core 2
-# Linux hostname 2.6.12-gentoo-r6 #7
+# Linux 2.6.12-gentoo-r6 #7
 Fingerprint Linux 2.6.5 - 2.6.12
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=BC-CE%GCD=<7%ISR=BC-D4%TI=Z%II=I%TS=A)
@@ -15628,6 +15523,7 @@ U1(DF=N%T=3B-45%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=
 IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
 # Linux 2.6.9-67.ELsmp #1 SMP Wed Nov 7 13:58:04 EST 2007 i686 i686 i386 GNU/Linux/Red Hat Linux
+# Infoblox NIOS version 4.1r5
 Fingerprint Linux 2.6.9 - 2.6.15
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=C7-D1%GCD=<7%ISR=CA-D4%TI=Z%II=I%TS=A)
@@ -15671,7 +15567,7 @@ IE(DFI=N%T=3B-45%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # 2.6.19-gentoo-r5
 # Linux 2.6.18-8.1.6.el5 #1 SMP Thu Jun 14 17:46:09 EDT 2007 i686 athlon i386 GNU/Linux | CentOS release 5
 # Linux 2.6.9 #7 Sun Jan 29 18:46:07 EST 2006 i686 GNU/Linux
-# Linux  2.6.25.14-69.fc8 #1 SMP Mon Aug 4 14:20:24 EDT 2008 i686 i686 i386 GNU/Linux
+# Linux 2.6.25.14-69.fc8 #1 SMP Mon Aug 4 14:20:24 EDT 2008 i686 i686 i386 GNU/Linux
 # Linux 2.6.9-42.ELsmp #1 SMP Sat Aug 12 09:39:11 CDT 2006 i686 i686 i386 GNU/Linux (CentOS release 4.4 (Final))
 Fingerprint Linux 2.6.9 - 2.6.25
 Class Linux | Linux | 2.6.X | general purpose
@@ -17383,13 +17279,14 @@ IE(DFI=N%T=7B-85%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Windows 95 on Compaq Deskpro EN 6350
 # Windows for Workgroups version 3.11
+# Windows for Workgroups 3.11, using Microsoft TCP/IP-32 3.11b.
 Fingerprint Microsoft Windows for Workgroups 3.11 or Windows 95
 Class Microsoft | Windows | 3.X | general purpose
 Class Microsoft | Windows | 95 | general purpose
-SEQ(SP=0-DF%GCD=<7|68|D0|138|1A0|208%ISR=4B-89%TI=BI|RD%II=BI%SS=S%TS=U)
+SEQ(SP=0-DF%GCD=<7|68|D0|138|1A0|208%ISR=4B-89%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
-ECN(R=Y%DF=Y%T=1B-25%TG=20%W=2238%O=|M5B4%CC=N%Q=)
+ECN(R=Y%DF=Y%T=1B-25%TG=20%W=2238%O=M5B4%CC=N%Q=)
 T1(R=Y%DF=Y%T=1B-25%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 T3(R=Y%DF=Y%T=1B-25%TG=20%W=2017%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
@@ -17421,7 +17318,7 @@ IE(DFI=S%T=1B-25%TG=20%TOSI=Z%CD=Z%SI=S%DLI=S)
 # Windows 95 4.00.950a (VMWare)
 Fingerprint Microsoft Windows 95
 Class Microsoft | Windows | 95 | general purpose
-SEQ(SP=0-50%GCD=<7|6E|DC|14A|1B8|226|294%ISR=4B-5D%TI=BI%II=BI%SS=S%TS=U)
+SEQ(SP=0-50%GCD=6E|DC|14A|1B8|226|294%ISR=4B-5D%TI=BI%II=BI%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2180%W5=2180%W6=2017)
 ECN(R=Y%DF=Y%T=1B-25%TG=20%W=2238%O=M5B4%CC=N%Q=)
@@ -17998,8 +17895,10 @@ U1(DF=N%T=7B-85%TG=80%TOS=0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G
 IE(DFI=N%T=7B-85%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # windows vista home basic version 6.0 compilacion 6000
-Fingerprint Microsoft Windows Vista Home Basic
+# 2008 server entreprise edition 64 bits with SP1 installed, french version
+Fingerprint Microsoft Windows Vista or Windows Server 2008 SP1
 Class Microsoft | Windows | Vista | general purpose
+Class Microsoft | Windows | 2008 | general purpose
 SEQ(SP=F8-102%GCD=<7%ISR=106-110%II=I%TS=7)
 OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -18080,9 +17979,10 @@ IE(DFI=N%T=7B-85%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Windows XP Build 2600.xpsp_sp2_gdr.070227-2554 SP2 (scanned from iPod touch, Nmap 4.50)
 # Version 5.1 (Build 2600.xpsp.050622-1524: Service Pack 2)
+# Microsoft Windows XP Professional SP2
 Fingerprint Microsoft Windows XP SP2
 Class Microsoft | Windows | XP | general purpose
-SEQ(SP=FC-106%GCD=<7%ISR=106-110%TI=I%II=I%SS=O|S%TS=0)
+SEQ(SP=FC-108%GCD=<7%ISR=106-110%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M5B4NW3NNT00NNS%O2=M5B4NW3NNT00NNS%O3=M5B4NW3NNT00%O4=M5B4NW3NNT00NNS%O5=M5B4NW3NNT00NNS%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=M5B4NW3NNS%CC=N%Q=)
@@ -18130,21 +18030,22 @@ IE(DFI=N%T=7B-85%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 # Version 5.1 (Build 2600.xpsp_sp2_rtm.040803-2158 : Service Pack 2 (Windows XP Tablet PC edition)
 # \320\222\320\265\321\200\321\201\320\270\321\217 5.1 (\321\201\320\261\320\276\321\200\320\272\320\260 2600.xpsp_sp2_rtm.040803-2158 : Service Pack 2)
 # Windows 2000
-Fingerprint Microsoft Windows 2000 SP2 - SP4, Windows XP SP2, or Windows Server 2003 SP0 - SP2
+Fingerprint Microsoft Windows 2000 SP2 - SP4, Windows XP SP2 - SP3, or Windows Server 2003 SP0 - SP2
+Class Microsoft | Windows | 2000 | general purpose
 Class Microsoft | Windows | XP | general purpose
 Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=F0-10C%GCD=<7%ISR=FB-111%TI=I%II=I%SS=S%TS=0)
-OPS(O1=NNT11|M5B4NW0NNT00NNS%O2=NNT11|M5B4NW0NNT00NNS%O3=NNT11|M5B4NW0NNT00%O4=NNT11|M5B4NW0NNT00NNS%O5=NNT11|M5B4NW0NNT00NNS%O6=NNT11|M5B4NNT00NNS)
+SEQ(SP=F8-108%GCD=<7%ISR=FB-112%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
 WIN(W1=4470%W2=41A0%W3=4100%W4=40E8%W5=40E8%W6=402E)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=4470%O=|M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=O|S+%F=A|AS%RD=0%Q=)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=4470%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=402E%S=O%A=O|S+%F=A|AS%O=NNT11|M5B4NW0NNT00NNS%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=402E%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%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
+U1(DF=N%T=7B-85%TG=80%TOS=0%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Microsoft Windows XP Professional SP2 (English)  [Winver: Version 5.1 (build 2600.xpsp_sp2_gdr.050301-1519: Service Pack 2)]
@@ -19174,28 +19075,6 @@ T7(R=N)
 U1(DF=N%T=7B-85%TG=80%TOS=0%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(R=N)
 
-# Version 5.1 (Build 2600.xpsp_sp2_qfe.070227-2300 : Service Pack 2), heavily locked down
-# Windows Server 2003 Enterprise Edition Version 5.2 (Build 3790.srv03_rtm.030324-2048)
-# XP Professional 5.1, Service Pack 2, Build 2600.
-# Versao 5.1 (compilacao 2600.xpsp_sp2_gdr.050301-1519 : Service Pack 2)
-# # Version 5.1 (Build 2600.xpsp.080413-2111:Service Pack 3)
-Fingerprint Microsoft Windows XP SP2 or SP3, or Windows Server 2003
-Class Microsoft | Windows | XP | general purpose
-Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=F8-108%GCD=<7%ISR=104-112%TI=I|RI%II=I%SS=S%TS=0)
-OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
-WIN(W1=4470%W2=41A0%W3=4100%W4=40E8%W5=40E8%W6=402E)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=4470%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=402E%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%TOS=0%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
-
 # version 5.1 (build 2600.xpsp_sp2_gdr.070227-2254: service pack 2)
 Fingerprint Microsoft Windows XP SP2
 Class Microsoft | Windows | XP | general purpose
@@ -19923,7 +19802,7 @@ IE(DFI=N%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 # Linksys WAG54G V.2, Firmware Version: 1.02.14-Pluto, Linux 2.4.17_mvl21-malta-mips_fp_le #95 Fri Dec 1 16:35:11 EST 2006 mips unknown
 # Canon CLC-iR C2620
 # Cisco Security Monitoring, Analysis and Response System (MARS)
-# Linux version 2.4.17_mvl21-malta-mips_fp_le (root@localhost.localdomain) (gcc version 2.95.3 20010315 (release/MontaVista)) #1 Mon Aug 27 17:17:05 PDT 2007 (Actiontec M1000 DSL modem, F/W: QA01.5: 3.60.3.0.8.1)
+# Linux 2.4.17_mvl21-malta-mips_fp_le (root@localhost.localdomain) (gcc version 2.95.3 20010315 (release/MontaVista)) #1 Mon Aug 27 17:17:05 PDT 2007 (Actiontec M1000 DSL modem, F/W: QA01.5: 3.60.3.0.8.1)
 # Vonage VOIP phone adapter and router. Model VT2142
 Fingerprint MontaVista embedded Linux 2.4.17
 Class MontaVista | Linux | 2.4.X | general purpose
@@ -20357,24 +20236,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=FA-104%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 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)
-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=M5B4NW0SNN%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=N%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=8000%S=O%A=S+%F=AS%O=M5B4NW0NNT01SNN%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%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
-
 # NetBSD 4.99.49 NetBSD 4.99.49 #1: Fri Jan 18 20:52:35 CET 2008 i386
 Fingerprint NetBSD 4.99.49 (x86)
 Class NetBSD | NetBSD | 4.X | general purpose
@@ -21920,10 +21781,13 @@ IE(DFI=N%T=FA-104%TG=FF%TOSI=S%CD=S%SI=S%DLI=S)
 # Terratec NOXON Audio system. (http://entertainen.terratec.net/modules.php?op=modload&name=News&file=article&sid=228)
 # Terratec Noxon2Audio Streaming Client
 # Terratec Noxon iRadio (standalone ethernet+wifi internet radio)
-Fingerprint Philips SLA5500 Wireless Music Adapter or WAK3300 wireless alarm clock, or Terratec NOXON audio system
+# Denon AVR-3808CI, a high-end home theater receiver
+# Philips SLA5520 Wireless Music Adapter
+Fingerprint Denon AVR-3808CI audio/video receiver, Philips SLA5500 or SLA5520 Wireless Music Adapter or WAK3300 wireless alarm clock, or Terratec NOXON audio system
+Class Denon | embedded || media device
 Class Philips | embedded || media device
 Class Terratec | embedded || media device
-SEQ(SP=C-16%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B|5DEFA%ISR=97-A1%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=C-16%GCD=FA7F|1F4FE|2EF7D|3E9FC%ISR=97-A1%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)
 ECN(R=Y%DF=N%T=19-23%TG=20%W=2000%O=M5B4%CC=N%Q=)
@@ -21996,7 +21860,8 @@ IE(DFI=N%T=7A-84%TG=80%TOSI=Z%CD=S%SI=S%DLI=S)
 # Polycom SoundPoint IP 430, SIP stack version 2.1.0.2708
 # Polycom SoundPoint IP 330/320.
 # Polycom SoundPoint 550 IP phone
-Fingerprint Polycom SoundPoint 320, 330, 430, or 550 IP phone
+# Polycom IP650
+Fingerprint Polycom SoundPoint 320, 330, 430, 550, or 650 IP phone
 Class Polycom | embedded || VoIP phone
 SEQ(SP=96-A0%GCD=<7%ISR=9B-A5%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
@@ -23442,8 +23307,10 @@ U1(DF=N%T=F5-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=F5-FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
 
 # Sitecom ADSL2+ Modem/Router 54G Turbo WL-174
-Fingerprint Sitecom WL-174 wireless ADSL router
+# ZyXEL AIR B-3000
+Fingerprint Sitecom WL-174 wireless ADSL router or ZyXEL B-3000 WAP
 Class Sitecom | embedded || WAP
+Class ZyXEL | embedded || WAP
 SEQ(R=N)
 OPS(O1=M200%O2=%O3=%O4=%O5=%O6=)
 WIN(W1=400%W2=0%W3=0%W4=0%W5=0%W6=0)
@@ -25042,7 +24909,11 @@ IE(DFI=S%T=37-41%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # TOSHIBA e-STUDIO 3510c
 # TOSHIBA e-STUDIO351c
 # Toshiba e-Studio 520 copier, Firmware Version T390SY0U321, Main ROM Version 390M-14, Scanner ROM Version 390S-05
-Fingerprint Toshiba e-STUDIO 351c, 3510c, or 520 multifunction printer
+# Aastra ip phone 57i Revision 0, Firmware Version 2.3.0.82
+# e-STUDIO 520 and an e-STUDIO 850
+# VxWorks? -- Ed.
+Fingerprint Aastra 57i IP phone or Toshiba e-STUDIO 351c, 3510c, 520, or 850 printer
+Class Aastra | embedded || VoIP phone
 Class Toshiba | embedded || printer
 SEQ(SP=FF-10B%GCD=<7%ISR=FF-10F%TI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
@@ -25358,7 +25229,9 @@ IE(R=N)
 # World Wide Packets LightningEdge (tm) LE-427 Access Distributor
 # World Wide Packets LightningEdge (tm) LE-311 Access Concentrator
 # World Wide Packets LightningEdge (tm) LE-327 Access Concentrator
-Fingerprint World Wide Packets LE-311, LE-327, or LE-427 LightningEdge switch
+# Ericsson BusinessPhone telephone exchange
+Fingerprint Ericsson BusinessPhone PBX, or World Wide Packets LE-311, LE-327, or LE-427 LightningEdge switch
+Class Ericsson | embedded || PBX
 Class World Wide Packets | embedded || switch
 SEQ(SP=44-4E%GCD=3E8|7D0|BB8|FA0|1388%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
@@ -27473,9 +27346,10 @@ IE(DFI=N%T=71-7B%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
 # Version 5.1 (Build 2600.xpsp.080413-2111 : Service Pack 3)
 # Version 5.1 (Build 2600.xpsp_sp2_gdr.070227-2254 : Service Pack 2)
+# Windows XP SP3 with disabled firewall.
 Fingerprint Microsoft Windows XP SP2 or SP3
 Class Microsoft | Windows | XP | general purpose
-SEQ(SP=100-10A%GCD=<7%ISR=108-112%TI=I%II=I%SS=S%TS=0)
+SEQ(SP=100-10A%GCD=<7%ISR=103-112%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
 WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=FAF0%O=M5B4NW0NNS%CC=N%Q=)
@@ -29376,3 +29250,37 @@ T6(R=Y%DF=N%T=1B-25%TG=20%W=2000%S=A%A=S%F=AR%O=%RD=0%Q=)
 T7(R=Y%DF=N%T=1B-25%TG=20%W=2000%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)
+
+# Windows Server 2003 R2 SP2
+Fingerprint Microsoft Windows Server 2003 SP2
+Class Microsoft | Windows | 2003 | general purpose
+SEQ(SP=FA-104%GCD=<7%ISR=106-110%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW2NNS%O2=M5B4NW2NNS%O3=M5B4NW2%O4=M5B4NW2NNS%O5=M5B4NW2NNS%O6=M5B4NNS)
+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=M5B4NW2NNS%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=M5B4NW2NNS%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=O%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=O%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(R=N)
+IE(DFI=S%T=3B-45%TG=40%TOSI=Z%CD=Z%SI=S%DLI=S)
+
+# Linux 2.6.18-92.1.13.el5 #1 SMP Wed Sep 24 19:33:52 EDT 2008 i686 i686 i386 GNU/Linux (CentOS release 5.2 (Final))
+Fingerprint Linux 2.6.18 (CentOS 5.2)
+Class Linux | Linux | 2.6.X | general purpose
+SEQ(SP=B4-BE%GCD=<7%ISR=BA-C4%TI=Z%II=I%TS=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%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(R=N)
+IE(DFI=N%T=3B-45%TG=40%TOSI=Z%CD=S%SI=S%DLI=S)