diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7c1d1b3..ec7aa0d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,9 @@
 -- Branch for Spring Boot 2.x:
+2.1.6 Concurrency fixes
+      Fix concurrency issues
+      Fix encoding bug in resouce bundles
+      (Thanks to pycnik <emil@speedment.com>)
+
 2.1.5 Code improvements
 
 2.1.4 Revert breaking changes
diff --git a/README.md b/README.md
index 5e0f603..0bcf375 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ Attention:
 The current master is for Spring Boot 2 and Spring Framework 5.
 
 The latest production ready releases: 
-*  For Spring Boot 1.5.x is 1.4.5.
-*  For Spring Boot 2.x is 2.1.5.
+*  For Spring Boot 1.5.x is 1.4.5. (End of life!)
+*  For Spring Boot 2.x is 2.1.6.
 
 Spring Boot and JavaFx - A perfect match!
 
diff --git a/pom.xml b/pom.xml
index 81178f6..6b943f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>de.roskenet</groupId>
   <artifactId>springboot-javafx-support</artifactId>
-  <version>2.1.6-SNAPSHOT</version>
+  <version>2.1.6</version>
   <packaging>jar</packaging>
 
   <name>springboot-javafx-support</name>
@@ -18,7 +18,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <spring-framework.version>5.0.0.RELEASE</spring-framework.version>
     <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
-    <spring-boot-javafx-test.version>1.2.0</spring-boot-javafx-test.version>
+    <spring-boot-javafx-test.version>1.3.0</spring-boot-javafx-test.version>
     <slf4j.version>1.7.25</slf4j.version>
   </properties>
 
@@ -101,32 +101,6 @@
     </snapshotRepository>
   </distributionManagement>
 
-  <!-- Add Spring repositories -->
-  <!-- (you don't need this if you are using a .RELEASE version) -->
-  <repositories>
-    <repository>
-      <id>spring-snapshots</id>
-      <url>http://repo.spring.io/snapshot</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>spring-milestones</id>
-      <url>http://repo.spring.io/milestone</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>spring-snapshots</id>
-      <url>http://repo.spring.io/snapshot</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>spring-milestones</id>
-      <url>http://repo.spring.io/milestone</url>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
     <plugins>
       <plugin>