diff --git a/build.gradle b/build.gradle
index eedd1913..e13a4c9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,9 +127,25 @@ packageTask('win64', 'lib/jna-win64.jar', []) { launch4j('win64') }
 
 packageTask('mac', [], []) {}
 
-//task 'win-installer'
+task 'win-installer'(dependsOn: ['win32', 'win64']) {
+    doLast {
+        def installerDir = 'ext/win-installer'
+        ant.replace(file: "${installerDir}/InstallerConfig.nsh") {
+            ant.replacefilter(token: "VERSION_MINOR", value: "5")
+            ant.replacefilter(token: "VERSION", value: version)
+        }
+        ant.copy(file: "build/libs/${project.name}-win32-${version}.exe", tofile:"${installerDir}/AppFiles32/ipscan.exe")
+        ant.copy(file: "build/libs/${project.name}-win64-${version}.exe", tofile:"${installerDir}/AppFiles64/ipscan.exe")
+        ant.exec(dir: "${installerDir}", executable: "wine") {
+            ant.arg(value: "NSISPortable/App/NSIS/makensis.exe")
+            ant.arg(value: "Installer/Installer.nsi")
+        }
+        ant.move(file: "${installerDir}/ipscan-${version}-setup.exe", todir:"build/libs")
+        ant.exec(command: "git checkout ${installerDir}/InstallerConfig.nsh")
+    }
+}
 
-task all(dependsOn: ['linux', 'linux64', 'win32', 'win64', 'mac'])
+task all(dependsOn: ['linux', 'linux64', 'mac', 'win-installer'])
 
 task info {
     doLast {