diff --git a/build.gradle b/build.gradle
index a5faec63..e3406876 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
diff --git a/docs/Changelog.md b/docs/Changelog.md
index fee5d5ea..d553c7a7 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## New since 0.11.1
+
+- Many other minor improvements and bug fixes
+- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.12.0)
+
 ## Version 0.11.1 (2019-04-12)
 
 - MBTiles raster tile source (Android) [#708](https://github.com/mapsforge/vtm/pull/708)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4e974715..c4486d47 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/vtm-web-app/build.gradle b/vtm-web-app/build.gradle
index 3d3754c7..cff22f28 100644
--- a/vtm-web-app/build.gradle
+++ b/vtm-web-app/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
+        classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
         classpath 'org.akhikhl.gretty:gretty:2.0.0'
     }
 }
@@ -41,7 +41,7 @@ gwt {
         noPrecompile = true
     }
     compiler {
-        enableClosureCompiler = false // activates -XenableClosureCompiler
+        //enableClosureCompiler = false // activates -XenableClosureCompiler
         disableClassMetadata = true // activates -XdisableClassMetadata
         disableCastChecking = true // activates -XdisableCastChecking
     }
diff --git a/vtm-web-js/build.gradle b/vtm-web-js/build.gradle
index dd2d43b2..469def1d 100644
--- a/vtm-web-js/build.gradle
+++ b/vtm-web-js/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
+        classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
         classpath 'org.akhikhl.gretty:gretty:2.0.0'
     }
 }
@@ -39,7 +39,7 @@ gwt {
         noPrecompile = true
     }
     compiler {
-        enableClosureCompiler = false // activates -XenableClosureCompiler
+        //enableClosureCompiler = false // activates -XenableClosureCompiler
         disableClassMetadata = true // activates -XdisableClassMetadata
         disableCastChecking = true // activates -XdisableCastChecking
     }
diff --git a/vtm-web/build.gradle b/vtm-web/build.gradle
index 55dfb510..6274dc21 100644
--- a/vtm-web/build.gradle
+++ b/vtm-web/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
+        classpath 'org.wisepersist:gwt-gradle-plugin:1.0.8'
     }
 }
 
@@ -38,7 +38,7 @@ gwt {
         noPrecompile = true
     }
     compiler {
-        enableClosureCompiler = false // activates -XenableClosureCompiler
+        //enableClosureCompiler = false // activates -XenableClosureCompiler
         disableClassMetadata = true // activates -XdisableClassMetadata
         disableCastChecking = true // activates -XdisableCastChecking
     }