diff --git a/.gitignore b/.gitignore
index 4cf13d0..d95ae3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /data
 /.gradle/
 /build/
+/bin/
diff --git a/README.md b/README.md
index aeba2d4..82ac539 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ ElasticSearch compatibility table:
 
 | elasticsearch |  Preanalyzed Mapper Plugin | Docs
 |---------------|----------------------------|------
-| es-5.3.2      |  5.3.2 | [5.3.2] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/master)
+| es-5.4.0      |  5.4.0 | [5.4.0] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/master)
+| es-5.3.2      |  5.3.2 | [5.3.2] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.3.2)
 | es-5.3.1      |  5.3.1 | [5.3.1] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.3.1)
 | es-5.3.0      |  5.3.0 | [5.3.0] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.3.0)
 | es-5.2.2      |  5.2.2 | [5.2.2] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.2.2)
diff --git a/build.gradle b/build.gradle
index a7b9979..c2f38c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ esplugin {
     name 'elasticsearch-mapper-preanalyzed'
     description 'This plugin allows to send field data in a preanalyzed format to ElasticSearch. No analysis will be done by ElasticSearch, the format defines all terms specifically.'
     classname 'org.elasticsearch.index.plugin.mapper.preanalyzed.MapperPreAnalyzedPlugin'
-    version '5.3.2'
+    version '5.4.0'
 }
 
 description = """ElasticSearch Preanalyzed Mapper Plugin"""
@@ -35,7 +35,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.elasticsearch.gradle:build-tools:5.3.2"
+        classpath "org.elasticsearch.gradle:build-tools:5.4.0"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6e0918b..8000951 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip