diff --git a/appveyor.yml b/appveyor.yml
index f98360de6..1f0a1092a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,5 +29,7 @@ before_build:
 build_script:
   - yarn run sync
   - yarn run release-win
+  - yarn run sync disableUpdate
+  - yarn run release-appx
 
 test: off
diff --git a/electron-builder-appx.json b/electron-builder-appx.json
new file mode 100644
index 000000000..8c71d4920
--- /dev/null
+++ b/electron-builder-appx.json
@@ -0,0 +1,50 @@
+{
+  "appId": "com.jgraph.drawio.desktop",
+  "copyright": "Copyright 2017-2019 draw.io",
+  "asar": true,
+  "files": [
+    "**/*",
+    "!**/WEB-INF{,/**}"
+  ],
+  "artifactName": "${productName}-${arch}-${version}.${ext}",
+  "directories": {
+    "app": "./drawio/src/main/webapp",
+    "output": "./dist/"
+  },
+  "npmRebuild": false,
+  "publish": {
+      "provider": "github"
+  },
+  "win": {
+    "target": [
+      {
+          "target": "appx",
+          "arch": [
+            "x64"
+          ]
+      }
+    ]
+  },
+  "appx": {
+    "displayName": "draw.io Diagrams",
+    "publisherDisplayName": "JGraph Ltd",
+    "identityName": "draw.io.draw.ioDiagrams",
+    "publisher": "CN=9E628CCB-BE04-4557-A5A8-81EC34B09733"
+  },
+  "fileAssociations": [
+	  {
+	  	"ext": "drawio",
+	  	"name": "draw.io Diagram",
+	  	"description": "draw.io Diagram",
+	  	"mimeType": "application/vnd.jgraph.mxfile",
+	  	"role": "Editor"
+	  },
+	  {
+	  	"ext": "vsdx",
+	  	"name": "VSDX Document",
+	  	"description": "VSDX Document",
+	  	"mimeType": "application/vnd.visio",
+	  	"role": "Editor"
+	  }
+  ]
+}
diff --git a/electron-builder-win.json b/electron-builder-win.json
index a9e77cd42..42778209f 100644
--- a/electron-builder-win.json
+++ b/electron-builder-win.json
@@ -28,12 +28,6 @@
           "arch": [
             "x64"
           ]
-      },
-      {
-          "target": "appx",
-          "arch": [
-            "x64"
-          ]
       }
     ]
   },
@@ -45,12 +39,6 @@
   "portable": {
     "artifactName": "${productName}-${version}-portable.${ext}"
   },
-  "appx": {
-    "displayName": "draw.io Diagrams",
-    "publisherDisplayName": "JGraph Ltd",
-    "identityName": "draw.io.draw.ioDiagrams",
-    "publisher": "CN=9E628CCB-BE04-4557-A5A8-81EC34B09733"
-  },
   "fileAssociations": [
 	  {
 	  	"ext": "drawio",
diff --git a/package.json b/package.json
index ecdc828ba..3013a060d 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "sync": "node ./sync.js",
     "release-win": "electron-builder --config electron-builder-win.json",
     "release-win32": "electron-builder --config electron-builder-win32.json",
+    "release-appx": "electron-builder --config electron-builder-appx.json",
     "release-linux": "electron-builder --config electron-builder-linux-mac.json",
     "release-snap": "electron-builder --config electron-builder-snap.json --publish never"
   },