diff --git a/README.md b/README.md
index d76e2d15b..8486143df 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ or maven :
 <dependency>
 	<groupId>org.mariadb.jdbc</groupId>
 	<artifactId>mariadb-java-client</artifactId>
-	<version>1.5.5</version>
+	<version>1.5.6</version>
 </dependency>
 ```
 
diff --git a/documentation/changelog.creole b/documentation/changelog.creole
index 533d17865..8ecc6a760 100644
--- a/documentation/changelog.creole
+++ b/documentation/changelog.creole
@@ -1,4 +1,5 @@
 = Changelog
+* [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#155|1.5.6]] Released on 21 Dec. 2016
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#155|1.5.5]] Released on 07 Nov. 2016
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#154|1.5.4]] Released on 10 Oct. 2016
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#153|1.5.3]] Released on 03 Oct. 2016
diff --git a/pom.xml b/pom.xml
index 7beec8d9d..da61a310e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>1.5.6-SNAPSHOT</version>
+    <version>1.5.6</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
index f5037fce2..9b3147997 100644
--- a/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
+++ b/src/main/java/org/mariadb/jdbc/MariaDbStatement.java
@@ -209,7 +209,7 @@ protected void executeQueryEpilog(QueryException queryException) throws SQLExcep
 
         if (isTimedout) {
             isTimedout = false;
-            queryException = new QueryException("(conn:" + getServerThreadId() + ") Query timed out", 1317, "JZ0002", queryException);
+            queryException = new QueryException("Query timed out", 1317, "JZ0002", queryException);
         }
 
         if (queryException == null) {
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
index b6c3e90ab..cefffdf31 100644
--- a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
+++ b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
@@ -51,10 +51,10 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 package org.mariadb.jdbc.internal.util.constant;
 
 public final class Version {
-    public static final String version = "1.5.6-SNAPSHOT";
+    public static final String version = "1.5.6";
     public static final int majorVersion = 1;
     public static final int minorVersion = 5;
     public static final int patchVersion = 6;
-    public static final String qualifier = "SNAPSHOT";
+    public static final String qualifier = "";
 
 }
\ No newline at end of file