diff --git a/src/installer.wxs b/src/installer.wxs
new file mode 100644
index 0000000..35f70fc
--- /dev/null
+++ b/src/installer.wxs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*"
+           Language="1033"
+           Manufacturer="Microsoft"
+           Name="etl2pcapng"
+           UpgradeCode="04112892-be8f-483a-9ce4-61630c8c2600"
+           Version="1.10.0">
+    <Package InstallScope="perUser" Compressed="yes" />
+    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
+    <MediaTemplate EmbedCab="yes" />
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="LocalAppDataFolder">
+        <Directory Id="COMPANYFOLDER" Name="Microsoft">
+          <Directory Id="INSTALLFOLDER" Name="etl2pcapng">
+            <Component Id="ProductComponent" Guid='f1ed5446-aeb7-493e-94cb-1bd6522bcc83'>
+              <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]'
+                             Name='InstallFolder'
+                             Value='[INSTALLFOLDER]'
+                             Type='string'
+                             KeyPath='yes' />
+              <File Source="etl2pcapng.exe" />
+              <RemoveFolder Id="COMPANYFOLDER" Directory='COMPANYFOLDER' On="uninstall"/>
+              <RemoveFolder Id="INSTALLFOLDER" On="uninstall"/>
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+    <DirectoryRef Id="TARGETDIR">
+      <Component Id="PathEnvUsr" Guid="d1b1d423-ffc1-41b9-985c-5f9895e8ad21">
+        <Environment Id="EnvPathUsr" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" Permanent="no"/>
+      </Component>
+    </DirectoryRef>
+    <Feature Id="etl2pcapng">
+      <ComponentRef Id="ProductComponent" />
+      <ComponentRef Id='PathEnvUsr' />
+    </Feature>
+  </Product>
+</Wix>
diff --git a/src/make_release.cmd b/src/make_release.cmd
index b1096f8..457f057 100644
--- a/src/make_release.cmd
+++ b/src/make_release.cmd
@@ -10,6 +10,8 @@ mkdir build_release\x86
 cd build_release\x64
 cmake -A x64 ../..
 cmake --build . --config Release
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" ..\..\installer.wxs -o Release\etl2pcapng.wixobj
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b Release -o Release\etl2pcapng.msi Release\etl2pcapng.wixobj
 cd ..\x86
 cmake -A Win32 ../..
 cmake --build . --config Release
@@ -21,6 +23,7 @@ mkdir etl2pcapng\x64
 mkdir etl2pcapng\x86
 copy build_release\x64\Release\etl2pcapng.exe etl2pcapng\x64
 copy build_release\x64\Release\etl2pcapng.pdb etl2pcapng\x64
+copy build_release\x64\Release\etl2pcapng.msi etl2pcapng\x64
 copy build_release\x86\Release\etl2pcapng.exe etl2pcapng\x86
 copy build_release\x86\Release\etl2pcapng.pdb etl2pcapng\x86