diff --git a/.drone.yml b/.drone.yml
index 9c284f20..dcda0185 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -98,6 +98,19 @@ pipeline:
       - zip -r $FILENAME cwtch
       - sha256sum $FILENAME > $FILENAME.sha256
       - rm -r cwtch
+  package-windows:
+    mem_limit: 3G
+    image: hp41/nsis:latest
+    when: 
+      repo: cwtch.im/ui
+      branch: [ master, windows_build ]
+      event: push
+    environment:
+    commands:
+      - cd deploy
+      - cp ./../nsis/cwtch-installer.nsi .
+      - makensis -v 3 cwtch-installer.nsi
+      - mv cwtch-installer.exe windows 
   deploy-buildfiles:
     image: pivotaldata/concourse-ssh
     secrets: [buildfiles_key]