diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 8fadadc7..b15e9a2f 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -41,6 +41,12 @@ jobs:
         run: |
           ./resources/scripts/package.ps1 -VersionNumber ${{ needs.next-version.outputs.new-release-version || '3.1.0' }}
 
+      - name: Package chocolatey
+        run: |
+          choco apikey --key $CHOCO_API_KEY --source https://push.chocolatey.org/
+          choco pack resources/chocolatey/glazewm.nuspec --version ${{ needs.next-version.outputs.new-release-version || '3.1.0' }} --outputdirectory out/
+          choco push out/glazewm.*.nupkg
+
       - uses: actions/upload-artifact@v4
         with:
           name: installers
diff --git a/resources/chocolatey/glazewm.nuspec b/resources/chocolatey/glazewm.nuspec
new file mode 100644
index 00000000..ce0f37b7
--- /dev/null
+++ b/resources/chocolatey/glazewm.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>glazewm</id>
+    <version>3.1.0</version>
+    <description>GlazeWM is a tiling window manager for Windows inspired by i3wm. </description>
+    <authors>glzr-io</authors>
+    <projectUrl>https://github.com/glzr-io/glazewm</projectUrl>
+    <license type="file">LICENSE.md</license>
+    <readme>README.md</readme>
+    <icon>icon.ico</icon>
+    <tags>glazewm window-manager</tags>
+  </metadata>
+  <files>
+    <file src="LICENSE.md" target="" />
+    <file src="README.md" target="" />
+    <file src="resources/assets/icon.ico" target="" />
+    <file src="tools\*" target="tools" />
+    <file src="out/installer-x64.msi" target="tools\installer-x64.msi" />
+    <file src="out/installer-arm64.msi" target="tools\installer-arm64.msi" />
+  </files>
+</package>
diff --git a/resources/chocolatey/tools/chocolateyInstall.ps1 b/resources/chocolatey/tools/chocolateyInstall.ps1
new file mode 100644
index 00000000..7d38567c
--- /dev/null
+++ b/resources/chocolatey/tools/chocolateyInstall.ps1
@@ -0,0 +1,15 @@
+$ErrorActionPreference = 'Stop'; # stop on all errors
+
+$toolsDir          = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+$installerLocation = Join-Path $toolsDir 'installer-universal.exe'
+
+$packageArgs = @{
+  packageName    = $packageName
+  fileType       = 'exe'
+  file           = $installerLocation
+  silentArgs     = "/qn /norestart"
+  validExitCodes = @(0, 3010, 1641)
+  softwareName   = 'GlazeWM'
+}
+
+Install-ChocolateyInstallPackage @packageArgs