diff --git a/appveyor.yml b/appveyor.yml
index 49bb1e51..7597c09f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -98,13 +98,20 @@ after_build:
     - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
     # Copy nheko data
     - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y
-    - move NhekoRelease\nheko.exe installer\packages\io.github.nhekoreborn.nheko\data
+    - copy NhekoRelease\nheko.exe installer\packages\io.github.nhekoreborn.nheko\data
     - mkdir tools
     - curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.3.0/QtInstallerFramework-windows-x86-4.3.0.exe
     - 7z x QtInstallerFramework-windows-x86-4.3.0.exe -otools -aoa
     - set PATH=%BUILD%\tools\bin;%PATH%
     - binarycreator.exe -f -c installer\config\config.xml -p installer\packages nheko-installer.exe
 
+    # build an msix
+    - mkdir msix
+    - xcopy .\NhekoRelease\*.* msix\*.* /s /e /c /y
+    - copy %BUILD%\resources\nheko.png msix
+    - copy %BUILD%\resources\AppxManifest.xml msix
+    - '"C:\Program Files (x86)\Windows Kits\10\App Certification Kit\makeappx.exe" pack -d msix -p nheko.msix'
+
     - copy nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe
     - copy nheko-installer.exe nheko-%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%-installer.exe
     - ps: .\.ci\upload-nightly.ps1
@@ -122,5 +129,6 @@ deploy:
 
 artifacts:
     - path: nheko_win_64.zip
+    - path: nheko.msix
     - path: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe
     - path: nheko-$(APPVEYOR_PULL_REQUEST_HEAD_COMMIT)-installer.exe
diff --git a/resources/AppxManifest.xml b/resources/AppxManifest.xml
new file mode 100644
index 00000000..57c7188e
--- /dev/null
+++ b/resources/AppxManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+  <Identity Name="im.nheko.Nheko" Version="0.11.3.4" Publisher="CN=NhekoReborn, O=NhekoReborn, L=Munich, S=Bavaria, C=Germany" ProcessorArchitecture="x64"/>
+  <Properties>
+    <DisplayName>Nheko</DisplayName>
+    <PublisherDisplayName>Nheko-Reborn</PublisherDisplayName>
+    <Description>Matrix client written in Qt</Description>
+    <Logo>nheko.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+    <Resource Language="de-de" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop"  MinVersion="10.0.14316.0" MaxVersionTested="10.0.15063.0"  />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+  </Capabilities>
+  <Applications>
+    <Application Id="im.nheko.nheko" Executable="nheko.exe" EntryPoint="Windows.FullTrustApplication"
+      uap10:RuntimeBehavior="packagedClassicApp"
+      uap10:TrustLevel="mediumIL">
+				<uap:VisualElements DisplayName="Nheko" Description="Matrix client written in Qt"	Square150x150Logo="nheko.png"
+					Square44x44Logo="nheko.png" BackgroundColor="#ffffff" />
+				<Extensions>
+					<uap:Extension Category="windows.protocol">
+						<uap:Protocol Name="matrix">
+							<uap:DisplayName>Matrix Link</uap:DisplayName>
+						</uap:Protocol>
+					</uap:Extension>
+				</Extensions>
+    </Application>
+  </Applications>
+</Package>
+