diff --git a/nmap-os-db b/nmap-os-db
index 8b366f882..07ec8023e 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -65075,6 +65075,24 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# Windows 10 Personal edition
+Fingerprint Microsoft Windows 10
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=F7-101%GCD=1-6%ISR=109-113%TI=I%CI=I%TS=A)
+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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5B4NW8NNS%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=O%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=O%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(R=N)
+
 # Localhost with Npcap
 # Version 1511 (OS Build 10586.494)
 Fingerprint Microsoft Windows 10 1511
@@ -65122,7 +65140,7 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 Fingerprint Microsoft Windows 10 build 10074 - 10586
 Class Microsoft | Windows | 10 | general purpose
 CPE cpe:/o:microsoft:windows_10 auto
-SEQ(SP=F7-10D%GCD=1-6%ISR=FB-113%TI=I%CI=I|RD%II=I%SS=S%TS=A)
+SEQ(SP=F7-10D%GCD=1-6%ISR=F9-113%TI=I%CI=I|RD%II=I%SS=S%TS=A)
 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)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
@@ -65172,6 +65190,43 @@ 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)
 
+# Microsoft Windows Version 1511 (OS Build 10586.164)
+Fingerprint Microsoft Windows 10 build 10586
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=103-10D%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
+OPS(O1=M5B4NW2ST11%O2=M5B4NW2ST11%O3=M5B4NW2NNT11%O4=M5B4NW2ST11%O5=M5B4NW2ST11%O6=M5B4ST11)
+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=M5B4NW2NNS%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=Y%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=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+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 1511 (OS Compilation 10586.318)
+# Windows 10 Pro Version 1607 (OS Build 14393.187)
+Fingerprint Microsoft Windows 10 build 10586 - 14393
+Class Microsoft | Windows | 10 | general purpose
+CPE cpe:/o:microsoft:windows_10 auto
+SEQ(SP=F8-10A%GCD=1-6%ISR=106-110%TI=I%II=I%SS=S%TS=A)
+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)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%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=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=N)
+T5(R=Y%DF=Y%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Windows 10 Enterprise
 # Version 1511
 Fingerprint Microsoft Windows 10 build 10586
@@ -70726,10 +70781,11 @@ 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)
 
 # windows 2012 pro
-Fingerprint Microsoft Windows Server 2012 Professional
+# Windows Server 2012 R2 version 6.3 (Build 9600)
+Fingerprint Microsoft Windows Server 2012 or Windows Server 2012 R2
 Class Microsoft | Windows | 2012 | general purpose
-CPE cpe:/o:microsoft:windows_server_2012 auto
-SEQ(SP=F4-FE%GCD=1-6%ISR=FA-104%TI=I%II=I%SS=S%TS=7)
+CPE cpe:/o:microsoft:windows_server_2012
+SEQ(SP=F4-FE%GCD=1-6%ISR=FA-10A%TI=I%II=I%SS=S%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)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
@@ -70887,6 +70943,60 @@ 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)
 
+# Microsoft Windows Server 2012 R2 Version 6.3 (Build 9600)
+Fingerprint Microsoft Windows Server 2012 R2
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012:r2 auto
+SEQ(SP=FC-106%GCD=1-6%ISR=106-110%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=NW8ST11%O2=NW8ST11%O3=NW8NNT11%O4=NW8ST11%O5=NW8ST11%O6=ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=NW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%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=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+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)
+
+# Microsoft Windows Server 2012 R2 - Version 6.3 (Build 9600)
+Fingerprint Microsoft Windows Server 2012 R2
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012:r2 auto
+SEQ(SP=FD-107%GCD=1-6%ISR=108-112%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M5B4NW2ST11%O2=M5B4NW2ST11%O3=M5B4NW2NNT11%O4=M5B4NW2ST11%O5=M5B4NW2ST11%O6=M5B4ST11)
+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=M5B4NW2NNS%CC=Y%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=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%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=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.3 (Build 9600)
+Fingerprint Microsoft Windows Server 2012 R2
+Class Microsoft | Windows | 2012 | general purpose
+CPE cpe:/o:microsoft:windows_server_2012:r2 auto
+SEQ(SP=F9-103%GCD=1-6%ISR=10A-114%CI=I%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)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%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=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.3 (Build 9600)
 Fingerprint Microsoft Windows Server 2012 R2 Update 1
 Class Microsoft | Windows | 2012 | general purpose
@@ -71438,6 +71548,42 @@ 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)
 
+# Windows 7 Enterprise
+Fingerprint Microsoft Windows 7
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=104-10E%TI=I%CI=I%II=I%SS=S%TS=7)
+OPS(O1=M594NW8ST11%O2=M594NW8ST11%O3=M594NW8NNT11%O4=M594NW8ST11%O5=M594NW8ST11%O6=M594ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M594NW8NNS%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=Y%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=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+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)
+
+# Windows 7 Ultimate N
+Fingerprint Microsoft Windows 7
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7 auto
+SEQ(SP=F6-100%GCD=1-6%ISR=FD-107%TI=I%II=I%SS=S%TS=7)
+OPS(O1=M529NW8ST11%O2=M529NW8ST11%O3=M529NW8NNT11%O4=M529NW8ST11%O5=M529NW8ST11%O6=M529ST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M529NW8NNS%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=Y%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Microsoft Windows 7 Enterprise [Version 6.1.7601]
 Fingerprint Microsoft Windows 7 Enterprise
 Class Microsoft | Windows | 7 | general purpose
@@ -72257,6 +72403,24 @@ 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)
 
+# Windows 7 Professional; Version 6.1 build 7601 Service Pack 1
+Fingerprint Microsoft Windows 7 SP1
+Class Microsoft | Windows | 7 | general purpose
+CPE cpe:/o:microsoft:windows_7::sp1 auto
+SEQ(SP=FC-106%GCD=1-6%ISR=109-113%TI=I%TS=7)
+OPS(O1=M55CNW8ST11%O2=M55CNW8ST11%O3=M55CNW8NNT11%O4=M55CNW8ST11%O5=M55CNW8ST11%O6=M55CST11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M55CNW8NNS%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=Y%T=7B-85%TG=80%W=0%S=O%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+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(R=N)
+
 # Version 6.1 Build 7601: SP1
 Fingerprint Microsoft Windows 7 SP1 or Windows Server 2008
 Class Microsoft | Windows | 7 | general purpose
@@ -72301,6 +72465,7 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z)
 # Microsoft Windows Server; Version 6.1 (Build 7601; Service Pack 1); Microsoft Windows Server 2008 R2 Standard Edition
 # Microsoft Windows Version 6.1 (Build 7601: Service Pack 1)
 # Version 6.3 buld 9600
+# Versión 6.1 (compilación 7601: Service Pack 1)
 Fingerprint Microsoft Windows 7 SP1 or Windows Server 2008 R2 SP1 or Windows 8.1 Update 1
 Class Microsoft | Windows | 7 | general purpose
 CPE cpe:/o:microsoft:windows_7::sp1
@@ -72308,7 +72473,7 @@ Class Microsoft | Windows | 2008 | general purpose
 CPE cpe:/o:microsoft:windows_server_2008:r2:sp1
 Class Microsoft | Windows | 8.1 | general purpose
 CPE cpe:/o:microsoft:windows_8.1 auto
-SEQ(SP=FD-10B%GCD=1-6%ISR=104-113%TI=I%CI=I|RD%II=I%SS=S%TS=7)
+SEQ(SP=F3-10B%GCD=1-6%ISR=104-113%TI=I%CI=I|RD%II=I%SS=S%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)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%CC=N%Q=)
@@ -72721,25 +72886,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)
 
-# Localhost
-# Version 6.3 (build 9600)
-Fingerprint Microsoft Windows 8.1
-Class Microsoft | Windows | 8.1 | general purpose
-CPE cpe:/o:microsoft:windows_8.1 auto
-SEQ(SP=FA-104%GCD=1-6%ISR=108-112%TI=I%CI=I%II=I%SS=S%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)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%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=Y%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=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-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=Z%RUCK=G%RUD=G)
-IE(DFI=N%T=7B-85%TG=80%CD=Z)
-
 # Windows 8.1 Enterprise
 Fingerprint Microsoft Windows 8.1 Enterprise
 Class Microsoft | Windows | 8.1 | general purpose
@@ -72758,6 +72904,25 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
+# Localhost
+# Version 6.3 (build 9600)
+Fingerprint Microsoft Windows 8.1 R1
+Class Microsoft | Windows | 8.1 | general purpose
+CPE cpe:/o:microsoft:windows_8.1:r1 auto
+SEQ(SP=FA-104%GCD=1-6%ISR=108-112%TI=I%CI=I%II=I%SS=S%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)
+ECN(R=Y%DF=Y%T=7B-85%TG=80%W=2000%O=M5B4NW8NNS%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=Y%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=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+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=Z%RUCK=G%RUD=G)
+IE(DFI=N%T=7B-85%TG=80%CD=Z)
+
 # Version 6.3 (Build 9600)
 Fingerprint Microsoft Windows 8.1 R1
 Class Microsoft | Windows | 8.1 | general purpose
@@ -80258,6 +80423,24 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# 6.36
+Fingerprint MikroTik RouterOS 6.36
+Class MikroTik | RouterOS | 6.X | router
+CPE cpe:/o:mikrotik:routeros:6.36 auto
+SEQ(SP=F8-102%GCD=1-6%ISR=10B-115%TI=Z%CI=Z%II=I%TS=6|7)
+OPS(O1=M5A0ST11NW4%O2=M5A0ST11NW4%O3=M5A0NNT11NW4%O4=M5A0ST11NW4%O5=M5A0ST11NW4%O6=M5A0ST11)
+WIN(W1=37C8%W2=37C8%W3=37C8%W4=37C8%W5=37C8%W6=37C8)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3840%O=M5A0NNSNW4%CC=Y%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # RouterOS 6.4
 Fingerprint MikroTik RouterOS 6.4
 Class MikroTik | RouterOS | 6.X | router