diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1c036e81c..a1ebf35d8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,7 @@
-Version 0.18-SNAPSHOT:
+Version 0.19-SNAPSHOT
+
+Version 0.18:
+   [fix] Update Netty to 4.1.116 and H2 2.1.214
    [feature] Server keep alive: added configuration setting so that the broker can specify a keep alive other then the one selected by clients. (#789)
    [feature] User properties: covered publish with user properties with tests and fixed publish of will messages. (#877)
    [feature] Topic alias: implemented handling of topic alias received by publishers. (#873)
diff --git a/README.md b/README.md
index 3f9751335..d418acdde 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,6 @@ Include dependency in your project:
 ## Build from sources
 
 After a git clone of the repository, cd into the cloned sources and: `./gradlew package`, at the end the distribution 
-package is present at `distribution/target/distribution-0.18-SNAPSHOT-bundle.tar.gz`
+package is present at `distribution/target/distribution-0.19-SNAPSHOT-bundle.tar.gz`
 
 In distribution/target directory will be produced the selfcontained file for the broker with all dependencies and a running script. 
diff --git a/broker/pom.xml b/broker/pom.xml
index 037376c50..7faced68a 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -5,7 +5,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>io.moquette</groupId>
-        <version>0.18-SNAPSHOT</version>
+        <version>0.19-SNAPSHOT</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
diff --git a/broker/src/main/java/io/moquette/broker/Server.java b/broker/src/main/java/io/moquette/broker/Server.java
index 0e957dcf3..6ca132cac 100644
--- a/broker/src/main/java/io/moquette/broker/Server.java
+++ b/broker/src/main/java/io/moquette/broker/Server.java
@@ -73,7 +73,7 @@
 public class Server {
 
     private static final Logger LOG = LoggerFactory.getLogger(io.moquette.broker.Server.class);
-    public static final String MOQUETTE_VERSION = "0.18-SNAPSHOT";
+    public static final String MOQUETTE_VERSION = "0.19-SNAPSHOT";
 
     private ScheduledExecutorService scheduler;
     private NewNettyAcceptor acceptor;
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 56e0afbbf..c9f1aa605 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -5,7 +5,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>io.moquette</groupId>
-        <version>0.18-SNAPSHOT</version>
+        <version>0.19-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution</artifactId>
diff --git a/distribution/src/main/scripts/moquette.bat b/distribution/src/main/scripts/moquette.bat
index be35ba6d7..9547f3f04 100644
--- a/distribution/src/main/scripts/moquette.bat
+++ b/distribution/src/main/scripts/moquette.bat
@@ -13,7 +13,7 @@ echo "  \_|  |_/\___/ \__, |\__,_|\___|\__|\__\___| \_|  |_/\_/\_\ \_/   \_/   "
 echo "                   | |                                                   "
 echo "                   |_|                                                   "
 echo "                                                                         "
-echo "                                               version: 0.18-SNAPSHOT    "
+echo "                                               version: 0.19-SNAPSHOT    "
 
 set "CURRENT_DIR=%cd%"
 if not "%MOQUETTE_HOME%" == "" goto gotHome
diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh
index 9bba364d4..a7a54be03 100644
--- a/distribution/src/main/scripts/moquette.sh
+++ b/distribution/src/main/scripts/moquette.sh
@@ -13,7 +13,7 @@ echo "  \_|  |_/\___/ \__, |\__,_|\___|\__|\__\___| \_|  |_/\_/\_\ \_/   \_/   "
 echo "                   | |                                                   "
 echo "                   |_|                                                   "
 echo "                                                                         "
-echo "                                               version: 0.18-SNAPSHOT    "
+echo "                                               version: 0.19-SNAPSHOT    "
 
 
 unset CDPATH
diff --git a/embedding_moquette/pom.xml b/embedding_moquette/pom.xml
index 45aa9103f..1ae358163 100644
--- a/embedding_moquette/pom.xml
+++ b/embedding_moquette/pom.xml
@@ -5,7 +5,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>io.moquette</groupId>
-        <version>0.18-SNAPSHOT</version>
+        <version>0.19-SNAPSHOT</version>
     </parent>
 
     <artifactId>embedded_test</artifactId>
diff --git a/pom.xml b/pom.xml
index 9a58cc79f..ee2c8418e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <artifactId>moquette-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.18-SNAPSHOT</version>
+    <version>0.19-SNAPSHOT</version>
     <name>Moquette MQTT</name>
     <description>Moquette lightweight MQTT Broker</description>
     <inceptionYear>2011</inceptionYear>