--- ./nmap-os-fingerprints.orig	Thu Dec 17 00:00:26 1998
+++ nmap-os-fingerprints	Thu Dec 17 00:14:38 1998
@@ -145,17 +145,6 @@
 T7(DF=N%W=1000%ACK=S++%Flags=AR%Ops=)
 PU(DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
 
-FingerPrint  Apple LaserWriter 16/600 PS Printer # Thanks to Stany
-TSeq(Class=C)
-T1(Resp=Y%DF=Y%W=111C%ACK=S++%Flags=AS%Ops=M)
-T2(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
-T3(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
-T4(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
-T5(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
-T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
-T7(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
-PU(Resp=N)
-
 FingerPrint  Asanta IntraStack Ethernet Switch (6014 DSB Versions: BP(2.06 ), FW(1.03 ))
 TSeq(Class=C%Val=4090000)
 T1(DF=N%W=400%ACK=S++%Flags=AS%Ops=M)
@@ -266,7 +255,7 @@
 T6(DF=N%W=0%ACK=O%Flags=R%Ops=)
 T7(DF=N%W=0%ACK=S++%Flags=AR%Ops=)
 
-FingerPrint  Cisco IOS 11.3  # Thanks to Jan B. Koum (Cisco 2516)
+FingerPrint  Cisco IOS 11.3 - 12.0(2)  # Thanks to Jan B. Koum (Cisco 2516)
 TSeq(Class=RI%gcd=<6%SI=>1F4)
 T1(DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
 T2(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
@@ -288,7 +277,7 @@
 T7(DF=N%W=0%ACK=S|O%Flags=AR%Ops=)
 PU(DF=N%TOS=C0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
 
-FingerPrint  Cisco 25XX Router (IOS 11.2(5.1) or 11.2(13)) # Thanks to Solar Designer
+FingerPrint  Cisco 25XX Router or Catalyst 29xx Switch (IOS 11.2(5.1) or 11.2(13)) # Thanks to Solar Designer
 TSeq(Class=RI%gcd=<6%SI=<18000)
 T1(DF=N%W=10C0%ACK=S++%Flags=AS%Ops=M)
 T2(Resp=Y%DF=N%W=0%ACK=O|S%Flags=AR%Ops=)
@@ -1043,3 +1032,111 @@
 T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
 T7(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
 PU(Resp=N)
+
+FingerPrint  Shiva AccessPort Bridge/Router Software 2.1.0 (1MB) with SpiderISDN V4.00.00[0A], ETS 300 102 (EuroISDN) #Submitted by Sten Kalenda (sten at rt dot roccadefinance dot nl) 
+T1(Resp=Y%DF=N%W=244%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+T3(Resp=N)
+T4(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=164%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
+
+FingerPrint  Cisco 5300 terminal server (Unknown IOS version) #Submitted by Michael Dodwell (mdodwell at vit dot bigpond dot net dot au)
+TSeq(Class=RI%gcd=1%SI=3F0E)
+TSeq(Class=RI%gcd=1%SI=2912)
+TSeq(Class=RI%gcd=1%SI=15B6)
+T1(Resp=Y%DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+T3(Resp=Y%DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
+T4(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
+
+FingerPrint  Cisco 5260 terminal server (Unknown IOS version) #Submitted by Michael Dodwell (mdodwell at vit dot bigpond dot net dot au) 
+TSeq(Class=RI%gcd=1%SI=1AB0)
+TSeq(Class=RI%gcd=1%SI=267A)
+TSeq(Class=RI%gcd=1%SI=5617)
+T1(Resp=Y%DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+T3(Resp=Y%DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
+T4(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
+
+FingerPrint  Remote Annex 4000 terminal server by Xylogics #Submitted by Michael Dodwell (mdodwell at vit dot bigpond dot au) 
+TSeq(Class=64K)
+T1(Resp=Y%DF=N%W=1000%ACK=S++%Flags=AS%Ops=)
+T2(Resp=N)
+T3(Resp=Y%DF=N%W=1000%ACK=O%Flags=A%Ops=)
+T4(Resp=Y%DF=N%W=1000%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=F%RIPCK=0%UCK=0%ULEN=134%DAT=E)
+
+FingerPrint  AS5200 #Submitted by Michael Dodwell (mdodwell at vit dot bigpond dot au)
+TSeq(Class=RI%gcd=1%SI=5CCA)
+TSeq(Class=RI%gcd=1%SI=308B)
+TSeq(Class=RI%gcd=1%SI=4AD0)
+T1(Resp=Y%DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+T3(Resp=Y%DF=N%W=1020%ACK=S++%Flags=AS%Ops=M)
+T4(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
+
+FingerPrint  SCO UnixWare 7 (support level 7.0.0t) #Submitted by Noah Romer (klevin at eskimo dot com)
+TSeq(Class=RI%gcd=1%SI=E2255)
+TSeq(Class=RI%gcd=1%SI=701D0)
+TSeq(Class=RI%gcd=1%SI=91BD7)
+T1(Resp=Y%DF=Y%W=60F4%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=N)
+T3(Resp=Y%DF=Y%W=6041%ACK=O%Flags=A%Ops=)
+T4(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=Y%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=Y%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=Y%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=E%UCK=E%ULEN=134%DAT=E)
+
+FingerPrint  HP-UX 9.05 #Submitted by Jonathan Scott Duff (duff at cbi dot tamucc dot edu)
+TSeq(Class=64K)
+T1(Resp=Y%DF=N%W=2000%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=N)
+T3(Resp=Y%DF=N%W=2000%ACK=O%Flags=A%Ops=)
+T4(Resp=Y%DF=N%W=2000%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=0%UCK=E%ULEN=134%DAT=E)
+
+FingerPrint  OpenStep 4.1 #Submitted by Max Vision (vision at whiteheats dot com)
+TSeq(Class=64K)
+T1(Resp=Y%DF=N%W=F87%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=N)
+T3(Resp=Y%DF=N%W=F87%ACK=O%Flags=A%Ops=)
+T4(Resp=Y%DF=N%W=1000%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=N%W=0%ACK=S++%Flags=AR%Ops=)
+T6(Resp=Y%DF=N%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=N%W=0%ACK=S%Flags=AR%Ops=)
+PU(Resp=Y%DF=N%TOS=0%IPLEN=38%RIPTL=148%RID=E%RIPCK=0%UCK=0%ULEN=134%DAT=E)
+  
+FingerPrint  Apple LaserWriter 16/600 PS Printer # //Thanks to Stany
+TSeq(Class=C%Val=360001)
+T1(Resp=Y%DF=Y%W=111C%ACK=S++%Flags=AS%Ops=M)
+T2(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T3(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T4(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T5(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T6(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+T7(Resp=Y%DF=Y%W=0%ACK=O%Flags=R%Ops=)
+PU(Resp=N)
+
+