diff --git a/identifiers/os_product.txt b/identifiers/os_product.txt
index 895b419a..e9ccddb0 100644
--- a/identifiers/os_product.txt
+++ b/identifiers/os_product.txt
@@ -307,7 +307,10 @@ WebCSU
 Windows
 Windows 10
 Windows 10 Mobile
+Windows 10 or Windows Server
 Windows 10 or Windows Server 2016
+Windows 10 or Windows Server 2019
+Windows 11
 Windows 2000
 Windows 2000 Datacenter Server
 Windows 2000 Server
@@ -319,6 +322,8 @@ Windows 8.1
 Windows 8.1 or Windows Server 2012 R2
 Windows 95
 Windows CE
+Windows Home Server
+Windows Home Server 2011
 Windows NT
 Windows NT Server
 Windows NT Workstation
@@ -335,7 +340,9 @@ Windows Server 2012
 Windows Server 2012 R2
 Windows Server 2016
 Windows Server 2019
+Windows Server 2022
 Windows Vista
+Windows Vista or Windows Server 2008
 Windows XP
 Wireless Controller
 Wireless LAN Controller
diff --git a/xml/smb_banners.xml b/xml/smb_banners.xml
new file mode 100644
index 00000000..b48b8692
--- /dev/null
+++ b/xml/smb_banners.xml
@@ -0,0 +1,277 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<fingerprints matches="smb.banner" protocol="smb" database_type="service" preference="0.90">
+
+    <fingerprint pattern="10.0.19045">
+        <description>Windows 10, Version 22H2</description>
+        <example os.build="19045">10.0.19045</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="22H2" />
+        <param pos="0" name="os.build" value="19045"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.22621">
+        <description>Windows 11, Version 22H2</description>
+        <example os.build="22621">10.0.22621</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 11"/>
+        <param pos="0" name="os.version" value="22H2" />
+        <param pos="0" name="os.build" value="22621"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.19044">
+        <description>Windows 10, Version 21H2</description>
+        <example os.build="19044">10.0.19044</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="21H2" />
+        <param pos="0" name="os.build" value="19044"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.22000">
+        <description>Windows 11, Version 21H2</description>
+        <example os.build="22000">10.0.22000</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 11"/>
+        <param pos="0" name="os.version" value="21H2" />
+        <param pos="0" name="os.build" value="22000"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.20348">
+        <description>Windows Server 2022</description>
+        <example os.build="20348">10.0.20348</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Server 2022"/>
+        <param pos="0" name="os.build" value="20348"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.19043">
+        <description>Windows 10, Version 21H1</description>
+        <example os.build="19043">10.0.19043</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="21H1" />
+        <param pos="0" name="os.build" value="19043"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.19042">
+        <description>Windows 10 / Windows Server, Version 20H2</description>
+        <example os.build="19042">10.0.19042</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10 or Windows Server"/>
+        <param pos="0" name="os.version" value="20H2" />
+        <param pos="0" name="os.build" value="19042"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.19041">
+        <description>Windows 10 / Windows Server, Version 2004</description>
+        <example os.build="19041">10.0.19041</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10 or Windows Server"/>
+        <param pos="0" name="os.version" value="2004" />
+        <param pos="0" name="os.build" value="19041"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.18363">
+        <description>Windows 10 / Windows Server, Version 1909</description>
+        <example os.build="18363">10.0.18363</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10 or Windows Server"/>
+        <param pos="0" name="os.version" value="1909" />
+        <param pos="0" name="os.build" value="18363"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.18362">
+        <description>Windows 10, Version 1903</description>
+        <example os.build="18362">10.0.18362</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="1903" />
+        <param pos="0" name="os.build" value="18362"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.0.6003">
+        <description>Windows Server 2008, Service Pack 2, Rollup KB4489887</description>
+        <example os.build="6003">6.0.6003</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Server 2008"/>
+        <param pos="0" name="os.version" value="Service Pack 2, Rollup KB4489887" />
+        <param pos="0" name="os.build" value="6003"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.17763">
+        <description>Windows 10 / Windows Server 2019, Version 1809</description>
+        <example os.build="17763">10.0.17763</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10 or Windows Server 2019"/>
+        <param pos="0" name="os.version" value="1809" />
+        <param pos="0" name="os.build" value="17763"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.17134">
+        <description>Windows 10, Version 1803</description>
+        <example os.build="17134">10.0.17134</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="1803" />
+        <param pos="0" name="os.build" value="17134"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.16299">
+        <description>Windows 10, Version 1709</description>
+        <example os.build="16299">10.0.16299</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="1709" />
+        <param pos="0" name="os.build" value="16299"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.15063">
+        <description>Windows 10, Version 1703</description>
+        <example os.build="15063">10.0.15063</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="1703" />
+        <param pos="0" name="os.build" value="15063"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.14393">
+        <description>Windows 10 / Windows Server 2016, Version 1607</description>
+        <example os.build="14393">10.0.14393</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10 or Windows Server 2016"/>
+        <param pos="0" name="os.version" value="1607" />
+        <param pos="0" name="os.build" value="14393"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.10586">
+        <description>Windows 10, Version 1511</description>
+        <example os.build="10586">10.0.10586</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="1511" />
+        <param pos="0" name="os.build" value="10586"/>
+    </fingerprint>
+
+    <fingerprint pattern="10.0.10240">
+        <description>Windows 10, Version 1507</description>
+        <example os.build="10240">10.0.10240</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 10"/>
+        <param pos="0" name="os.version" value="1507" />
+        <param pos="0" name="os.build" value="10240"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.3.9600">
+        <description>Windows 8.1 / Windows Server 2012 R2</description>
+        <example os.build="9600">6.3.9600</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 8.1 or Windows Server 2012 R2"/>
+        <param pos="0" name="os.build" value="9600"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.2.9200">
+        <description>Windows 8 / Windows Server 2012</description>
+        <example os.build="9200">6.2.9200</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 8 or Windows Server 2012"/>
+        <param pos="0" name="os.build" value="9200"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.1.8400">
+        <description>Windows Home Server 2011</description>
+        <example os.build="8400">6.1.8400</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Home Server 2011"/>
+        <param pos="0" name="os.build" value="8400"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.1.7601">
+        <description>Windows 7 / Windows Server 2008 R2, Service Pack 1</description>
+        <example os.build="7601">6.1.7601</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 7 or Windows Server 2008 R2"/>
+        <param pos="0" name="os.version" value="Service Pack 1" />
+        <param pos="0" name="os.build" value="7601"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.1.7600">
+        <description>Windows 7 / Windows Server 2008 R2</description>
+        <example os.build="7600">6.1.7600</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows 7 or Windows Server 2008 R2"/>
+        <param pos="0" name="os.build" value="7600"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.0.6002">
+        <description>Windows Vista / Windows Server 2008, Service Pack 2</description>
+        <example os.build="6002">6.0.6002</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Vista or Windows Server 2008"/>
+        <param pos="0" name="os.version" value="Service Pack 2" />
+        <param pos="0" name="os.build" value="6002"/>
+    </fingerprint>
+
+    <fingerprint pattern="5.1.2600">
+        <description>Windows XP, Service Pack 3</description>
+        <example os.build="2600">5.1.2600</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows XP"/>
+        <param pos="0" name="os.version" value="Service Pack 3" />
+        <param pos="0" name="os.build" value="2600"/>
+    </fingerprint>
+
+    <fingerprint pattern="6.0.6001">
+        <description>Windows Server 2008</description>
+        <example os.build="6001">6.0.6001</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Server 2008"/>
+        <param pos="0" name="os.build" value="6001"/>
+    </fingerprint>
+
+    <fingerprint pattern="5.2.4500">
+        <description>Windows Home Server</description>
+        <example os.build="4500">5.2.4500</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Home Server"/>
+        <param pos="0" name="os.build" value="4500"/>
+    </fingerprint>
+
+    <fingerprint pattern="5.2.3790">
+        <description>Windows Server 2003 R2, Service Pack 2</description>
+        <example os.build="3790">5.2.3790</example>
+        <param pos="0" name="os.certainty" value="1.0"/>
+        <param pos="0" name="os.vendor" value="Microsoft"/>
+        <param pos="0" name="os.product" value="Windows Server 2003 R2"/>
+        <param pos="0" name="os.version" value="Service Pack 2" />
+        <param pos="0" name="os.build" value="3790"/>
+    </fingerprint>
+
+</fingerprints>
\ No newline at end of file