diff --git a/nmap-os-db b/nmap-os-db
index 0d12971ab..ee3149b0a 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -7254,6 +7254,30 @@ 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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# Cisco WS-C3512-XL
+# Cisco IOS (tm) C3500XL Software (C3500XL-C3H2S-M), Version 12.0(5)WC10
+# IOS (tm) C2900XL Software (C2900XL-C3H2S-M), Version 12.0(5)WC17, RELEASE SOFTWARE (fc1)
+# IOS (tm) C3500XL Software (C3500XL-C3H2S-M), Version 12.0(5)WC17, RELEASE SOFTWARE (fc1)
+# Cisco 3548XL switch, IOS 12.0(5)WC16 Enterprise Edition
+# IOS (tm) C2600 Software (C2600-I-M), Version 11.3(11b)T5,  RELEASE SOFTWARE (fc1)
+# IOS (tm) C2950 Software (C2950-C3H2S-M), Version 12.0(5.3)WC(1)
+Fingerprint Cisco Catalyst 2600-, 2900- or 3500 XL-series switch (IOS 11.3 - 12.0)
+Class Cisco | IOS | 11.X | switch
+Class Cisco | IOS | 12.X | switch
+SEQ(SP=ED-10B%GCD=1-6%ISR=102-10E%TI=Z%II=RI%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+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=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # Cisco IOS Software, SOHO97 Software (SOHO97-K9OY1-M), Version 12.4(25a)
 Fingerprint Cisco SOHO 97 ADSL router
 Class Cisco | IOS | 12.X | broadband router
@@ -8168,30 +8192,6 @@ T7(R=Y%DF=N%T=FC-106%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=100%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=100%TG=FF%CD=S)
 
-# Cisco WS-C3512-XL
-# Cisco IOS (tm) C3500XL Software (C3500XL-C3H2S-M), Version 12.0(5)WC10
-# IOS (tm) C2900XL Software (C2900XL-C3H2S-M), Version 12.0(5)WC17, RELEASE SOFTWARE (fc1)
-# IOS (tm) C3500XL Software (C3500XL-C3H2S-M), Version 12.0(5)WC17, RELEASE SOFTWARE (fc1)
-# Cisco 3548XL switch, IOS 12.0(5)WC16 Enterprise Edition
-# IOS (tm) C2600 Software (C2600-I-M), Version 11.3(11b)T5,  RELEASE SOFTWARE (fc1)
-# IOS (tm) C2950 Software (C2950-C3H2S-M), Version 12.0(5.3)WC(1)
-Fingerprint Cisco Catalyst 2600-, 2900- or 3500 XL-series switch (IOS 11.3 - 12.0)
-Class Cisco | IOS | 11.X | switch
-Class Cisco | IOS | 12.X | switch
-SEQ(SP=ED-10B%GCD=1-6%ISR=102-10E%TI=Z%II=RI%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-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=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
-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%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # WS-C2912-XL-A Version 12.0(5)XU
 Fingerprint Cisco Catalyst 2912 switch (IOS 12.0)
 Class Cisco | IOS | 12.X | switch
@@ -30025,6 +30025,23 @@ 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)
 
+# Version 5.0 (Build 2195; Service Pack 4)
+Fingerprint Microsoft Windows 2000 SP4
+Class Microsoft | Windows | 2000 | general purpose
+SEQ(SP=FE-108%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=O|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=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)
+
 # Microsoft Windows XP Professional with Service Pack 1 (infected with the Korgo worm)
 # Version 5.0 (Build 2195: Service Pack 4)
 # Brady Wraptor wire printer. http://www.bradyid.com/wraptor
@@ -30105,23 +30122,6 @@ T7(R=N)
 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)
 
-# Version 5.0 (Build 2195; Service Pack 4)
-Fingerprint Microsoft Windows 2000 SP4
-Class Microsoft | Windows | 2000 | general purpose
-SEQ(SP=FE-108%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=O|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=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)
-
 # W2K3 Server running Exch2K3
 Fingerprint Microsoft Windows Server 2003
 Class Microsoft | Windows | 2003 | general purpose
@@ -30139,40 +30139,6 @@ 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(R=N)
 
-# Microsoft Windows Small Business Server 2003 Version 5.2 (Build 3790.srv03_gdr.070301-2306)
-Fingerprint Microsoft Windows Small Business Server 2003
-Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=FA-104%GCD=1-6%ISR=106-110%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=S+%F=AS%RD=0%Q=)
-T2(R=N)
-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=N)
-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)
-
-# Version 5.2 (Build 3790.srv03_sp1_gdr.070304-2232 : Service Pack 1)
-Fingerprint Microsoft Windows Small Business Server 2003 SP1
-Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=FF-109%GCD=1-6%ISR=FD-111%II=I%TS=0)
-OPS(O1=M564NW0NNT00NNS%O2=M564NW0NNT00NNS%O3=M564NW0NNT00%O4=M564NW0NNT00NNS%O5=M564NW0NNT00NNS%O6=M564NNT00NNS)
-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=M564NW0NNS%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=Y%T=21-3E%TG=40%W=80%S=A%A=S%F=AR%O=WANM109T10S%RD=0%Q=)
-T3(R=Y%DF=N%T=24-3B%TG=40%W=100%S=A%A=S+%F=AR%O=WANM109T10S%RD=0%Q=)
-T4(R=Y%DF=Y%T=27-35%TG=40%W=400%S=A%A=S%F=AR%O=WANM109T10S%RD=0%Q=)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=22-3A%TG=40%W=8000%S=A%A=S%F=AR%O=WANM109T10S%RD=0%Q=)
-T7(R=Y%DF=N%T=25-2F|31-3F%TG=40%W=FFFF%S=A%A=S+%F=AR%O=WFNM109T10S%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)
-
 # Microsoft Windows 2003 Server [Winver: Version 5.2 (Build 3790.srv03_gdr.050225-1827)]
 Fingerprint Microsoft Windows Server 2003
 Class Microsoft | Windows | 2003 | general purpose
@@ -30378,26 +30344,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=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
-# Windows Server 2003 Standard (NO SP) [Winver: Version 5.2 (Build 3790.srv03_rtm.030324-2048)]
-# Version 5.1 (Build 2600.xpsp_sp2_gdr.070227-2254 : Service Pack 2)
-# Version 5.1 (Build 2600.xpsp_sp3_gdr.080814-1236 : Service Pack 3)
-Fingerprint Microsoft Windows Server 2003 SP0 or Windows XP SP2
-Class Microsoft | Windows | XP | general purpose
-Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=F6-10C%GCD=1-6%ISR=107-111%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%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=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=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-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 2003 Server winver output: Version 5.2 (Build 3790.srv03_sp1_rtm.050324-1447 : Service Pack 1)
 # Windows Server 2003 - 3790.srv03_sp1_rtm.050324-1447, Service Pack 1
 # windows 2003 x64 5.2 build 3790.srv03_sp1_gdr.060315-1609
@@ -31494,33 +31440,16 @@ 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)
 
-# Version 5.2 (Build 3790.srv_gdr.050225-1827 (Windows SBS 2003 Running on an HP ML 380)
-Fingerprint Microsoft Windows Small Business Server 2003
+# Microsoft Windows version 5.2 (build 3790.srv03_sp2_gdr.070321-2337 : Service Pack 2
+Fingerprint Microsoft Windows Server 2003 SP2 (x64)
 Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=FA-104%GCD=1-6%ISR=FE-108%II=I%TS=0)
-OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%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=M5B4NW0NNS%CC=N%Q=)
+SEQ(SP=F6-100%GCD=1-6%ISR=102-10C%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M535NW0NNT00NNS%O2=M535NW0NNT00NNS%O3=M535NW0NNT00%O4=M535NW0NNT00NNS%O5=M535NW0NNT00NNS%O6=M535NNT00NNS)
+WIN(W1=43B1%W2=43B1%W3=4100%W4=40E8%W5=40E8%W6=402E)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=43B1%O=M535NW0NNS%CC=N%Q=)
 T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-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=N)
-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)
-
-# Microsoft (r) Windows Version 5.2 R2 (Build 3790.srv03_sp1_gdr.090319-1204: Service Pack 1)
-Fingerprint Microsoft Windows Version Server 2003 R2 SP1
-Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4NW0NNS%O2=M5B4NW0NNS%O3=M5B4NW0%O4=M5B4NW0NNS%O5=M5B4NW0NNS%O6=M5B4NNS)
-WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
-ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M5B4NW0NNS%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=Y%DF=N%T=7B-85%TG=80%W=FAF0%S=O%A=S+%F=AS%O=M5B4NW0NNS%RD=0%Q=)
+T3(R=Y%DF=Y%T=7B-85%TG=80%W=402E%S=O%A=S+%F=AS%O=M535NW0NNT00NNS%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=)
@@ -31545,6 +31474,74 @@ 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=470|4A5|5399|56BA|F24B%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
+# Microsoft Windows Small Business Server 2003 Version 5.2 (Build 3790.srv03_gdr.070301-2306)
+Fingerprint Microsoft Windows Small Business Server 2003
+Class Microsoft | Windows | 2003 | general purpose
+SEQ(SP=FA-104%GCD=1-6%ISR=106-110%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=S+%F=AS%RD=0%Q=)
+T2(R=N)
+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=N)
+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)
+
+# Version 5.2 (Build 3790.srv_gdr.050225-1827 (Windows SBS 2003 Running on an HP ML 380)
+Fingerprint Microsoft Windows Small Business Server 2003
+Class Microsoft | Windows | 2003 | general purpose
+SEQ(SP=FA-104%GCD=1-6%ISR=FE-108%II=I%TS=0)
+OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%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=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=N)
+T3(R=N)
+T4(R=N)
+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=N)
+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)
+
+# Version 5.2 (Build 3790.srv03_sp1_gdr.070304-2232 : Service Pack 1)
+Fingerprint Microsoft Windows Small Business Server 2003 SP1
+Class Microsoft | Windows | 2003 | general purpose
+SEQ(SP=FF-109%GCD=1-6%ISR=FD-111%II=I%TS=0)
+OPS(O1=M564NW0NNT00NNS%O2=M564NW0NNT00NNS%O3=M564NW0NNT00%O4=M564NW0NNT00NNS%O5=M564NW0NNT00NNS%O6=M564NNT00NNS)
+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=M564NW0NNS%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=Y%T=21-3E%TG=40%W=80%S=A%A=S%F=AR%O=WANM109T10S%RD=0%Q=)
+T3(R=Y%DF=N%T=24-3B%TG=40%W=100%S=A%A=S+%F=AR%O=WANM109T10S%RD=0%Q=)
+T4(R=Y%DF=Y%T=27-35%TG=40%W=400%S=A%A=S%F=AR%O=WANM109T10S%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=22-3A%TG=40%W=8000%S=A%A=S%F=AR%O=WANM109T10S%RD=0%Q=)
+T7(R=Y%DF=N%T=25-2F|31-3F%TG=40%W=FFFF%S=A%A=S+%F=AR%O=WFNM109T10S%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)
+
+# Microsoft (r) Windows Version 5.2 R2 (Build 3790.srv03_sp1_gdr.090319-1204: Service Pack 1)
+Fingerprint Microsoft Windows Version Server 2003 R2 SP1
+Class Microsoft | Windows | 2003 | general purpose
+SEQ(SP=FF-109%GCD=1-6%ISR=103-10D%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW0NNS%O2=M5B4NW0NNS%O3=M5B4NW0%O4=M5B4NW0NNS%O5=M5B4NW0NNS%O6=M5B4NNS)
+WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M5B4NW0NNS%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=Y%DF=N%T=7B-85%TG=80%W=FAF0%S=O%A=S+%F=AS%O=M5B4NW0NNS%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)
+
 # Version 6.1 (Build 7600)
 Fingerprint Microsoft Windows Server 2008
 Class Microsoft | Windows | 2008 | general purpose
@@ -31749,23 +31746,6 @@ T7(R=Y%DF=Y%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
-# Version 6.0 Build 6001 SP 1
-Fingerprint Microsoft Windows Vista SP1
-Class Microsoft | Windows | Vista | general purpose
-SEQ(SP=FF-109%GCD=1-6%ISR=101-10B%CI=I%II=I%TS=7)
-OPS(O1=M557NW8ST11%O2=M557NW8ST11%O3=M557NW8NNT11%O4=M557NW8ST11%O5=M557NW8ST11%O6=M557ST11)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=Y%T=7A-84%TG=80%W=2000%O=M557NW8NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7A-84%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7A-84%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7A-84%TG=80%CD=Z)
-
 # Windows 3.1 with Trumpet WinSock 3.0D running in DOSBox 0.73 MB5
 Fingerprint Microsoft Windows 3.1 with Trumpet WinSock
 Class Microsoft | Windows | 3.X | general purpose
@@ -33129,6 +33109,23 @@ T7(R=N)
 U1(DF=N%T=7B-85%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7B-85%TG=80%CD=Z)
 
+# Version 6.0 Build 6001 SP 1
+Fingerprint Microsoft Windows Vista SP1
+Class Microsoft | Windows | Vista | general purpose
+SEQ(SP=FF-109%GCD=1-6%ISR=101-10B%CI=I%II=I%TS=7)
+OPS(O1=M557NW8ST11%O2=M557NW8ST11%O3=M557NW8NNT11%O4=M557NW8ST11%O5=M557NW8ST11%O6=M557ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7A-84%TG=80%W=2000%O=M557NW8NNS%CC=N%Q=)
+T1(R=Y%DF=Y%T=7A-84%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=Y%T=7A-84%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=7A-84%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7A-84%TG=80%CD=Z)
+
 # Version 6.0 (Build 6001: Service Pack 1)
 Fingerprint Microsoft Windows Vista SP1
 Class Microsoft | Windows | Vista | general purpose
@@ -33265,20 +33262,23 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=Z)
 
-# Microsoft Windows version 5.2 (build 3790.srv03_sp2_gdr.070321-2337 : Service Pack 2
-Fingerprint Microsoft Windows Server 2003 SP2 (x64)
+# Windows Server 2003 Standard (NO SP) [Winver: Version 5.2 (Build 3790.srv03_rtm.030324-2048)]
+# Version 5.1 (Build 2600.xpsp_sp2_gdr.070227-2254 : Service Pack 2)
+# Version 5.1 (Build 2600.xpsp_sp3_gdr.080814-1236 : Service Pack 3)
+Fingerprint Microsoft Windows Server 2003 SP0 or Windows XP SP2
+Class Microsoft | Windows | XP | general purpose
 Class Microsoft | Windows | 2003 | general purpose
-SEQ(SP=F6-100%GCD=1-6%ISR=102-10C%TI=I%II=I%SS=S%TS=0)
-OPS(O1=M535NW0NNT00NNS%O2=M535NW0NNT00NNS%O3=M535NW0NNT00%O4=M535NW0NNT00NNS%O5=M535NW0NNT00NNS%O6=M535NNT00NNS)
-WIN(W1=43B1%W2=43B1%W3=4100%W4=40E8%W5=40E8%W6=402E)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=43B1%O=M535NW0NNS%CC=N%Q=)
+SEQ(SP=F6-10C%GCD=1-6%ISR=107-111%TI=I%II=I%SS=S%TS=0)
+OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%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=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=M535NW0NNT00NNS%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=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
 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=)
+T6(R=N)
+T7(R=N)
 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)
 
@@ -35050,6 +35050,23 @@ 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)
 
+# Microsoft Windows Version 5.2 (Build 3790.srv03_sp2_gdr.090319-1204 : Service Pack 2)
+Fingerprint Microsoft Windows XP SP2
+Class Microsoft | Windows | XP | general purpose
+SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=RD%CI=I%II=I%TS=0)
+OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
+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=M5B4NW0NNS%CC=N%Q=)
+T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+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=N)
+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)
+
 # Microsoft Windows XP Versiom 5.1 (Build 2600.xpsp_sp2_gdr.061219-0316 Service Pack 2) (Firewall on scaned computer is turned off.)
 Fingerprint Microsoft Windows XP SP2 (firewall disabled)
 Class Microsoft | Windows | XP | general purpose
@@ -36447,23 +36464,6 @@ T7(R=N)
 U1(DF=N%T=7B-85%TG=80%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
-# Microsoft Windows Version 5.2 (Build 3790.srv03_sp2_gdr.090319-1204 : Service Pack 2)
-Fingerprint Microsoft Windows XP SP2
-Class Microsoft | Windows | XP | general purpose
-SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=RD%CI=I%II=I%TS=0)
-OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
-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=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-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=N)
-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)
-
 # OS-9/68K V3.0.3 ELTEC BAB-40 - 68040
 Fingerprint Microware OS-9/68000 3.0.3
 Class Microware | OS-9 || specialized