diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5040511a1..512a05ae9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
 build:
   stage: build
   script:
-    - sed -i " 1 s/.*/&-b$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)/" version
+    - sed -i " 1 s/.*/&-glb$(git rev-list --count HEAD)-$(git rev-parse --short HEAD)/" version
     - cat version
     - ./gradlew -g /cache/.gradle clean build jacocoTestReport
     - ./gradlew -g /cache/.gradle clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN
@@ -21,3 +21,4 @@ build:
   artifacts:
     paths:
     - build/jadx*.zip
+    - build/jadx*.exe
diff --git a/.travis.yml b/.travis.yml
index bee036cea..3a060eb01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ jdk:
     - oraclejdk8
 
 env:
-    - TERM=dumb
+    - TERM=dumb GRADLE_OPTS="-Dorg.gradle.daemon=false"
 
 before_install:
     - chmod +x gradlew
diff --git a/bintray.json b/bintray.json
index bedaa3578..a8e436796 100644
--- a/bintray.json
+++ b/bintray.json
@@ -22,7 +22,7 @@
   },
   "files": [
     {
-      "includePattern": "build/(jadx.*\.zip)",
+      "includePattern": "build/(jadx.*\.(zip|exe))",
       "uploadPattern": "$1",
       "matrixParams": {
         "override": 1
diff --git a/build.gradle b/build.gradle
index 4341add04..7e43a9400 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,17 +96,29 @@ task pack(type: Zip, dependsOn: copyArtifacts) {
     from copyArtifacts.destinationDir
 }
 
-task dist(dependsOn: pack) {
+task copyExe(type: Copy, dependsOn: 'jadx-gui:createExe') {
+    group 'jadx'
+    description = 'Copy exe to build dir'
+    destinationDir buildDir
+    from tasks.getByPath('jadx-gui:createExe').outputs
+    include '*.exe'
+}
+
+task dist(dependsOn: [pack, copyExe]) {
+    group 'jadx'
     description = 'Build jadx distribution zip'
 }
 
 task samples(dependsOn: 'jadx-samples:samples') {
+    group 'jadx'
 }
 
 task testAppCheck(dependsOn: 'jadx-test-app:testAppCheck') {
+    group 'jadx'
 }
 
 task cleanBuildDir(type: Delete) {
+    group 'jadx'
     delete buildDir
 }
 
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index 7390e661d..b73363623 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -1,3 +1,8 @@
+plugins {
+    id 'edu.sc.seis.launch4j' version '2.4.3'
+    id 'com.github.johnrengelman.shadow' version '2.0.2'
+}
+
 apply plugin: 'application'
 
 mainClassName = 'jadx.gui.JadxGUI'
@@ -40,6 +45,20 @@ startScripts {
     }
 }
 
+launch4j {
+    mainClassName = 'jadx.gui.JadxGUI'
+    copyConfigurable = project.tasks.shadowJar.outputs.files
+    jar = "lib/${project.tasks.shadowJar.archiveName}"
+//  icon = "${projectDir}/icons/myApp.ico"
+    outfile = "jadx-gui-${version}.exe"
+    copyright = 'Skylot'
+    windowTitle = 'jadx'
+    jreRuntimeBits = "64"
+    initialHeapPercent = 5
+    maxHeapSize = 4096
+    maxHeapPercent = 70
+}
+
 test {
     jacoco {
         enabled = false
diff --git a/jadx-samples/build.gradle b/jadx-samples/build.gradle
index f21e0c070..9c0c88cb3 100644
--- a/jadx-samples/build.gradle
+++ b/jadx-samples/build.gradle
@@ -33,6 +33,7 @@ task samplesJadxCompile(type: JavaCompile, dependsOn: samplesJadxCreate) {
     classpath = configurations.compile
     destinationDir = file samplesJadxOutDir
     source = samplesJadxSrcDir
+    options.encoding = "UTF-8"
 }
 
 task samplesJadxRun(type: JavaExec, dependsOn: samplesJadxCompile) {