diff --git a/broker/pom.xml b/broker/pom.xml
index 53e4aa9b..d7623565 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -7,7 +7,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
index 33a61f35..8560666e 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
@@ -26,7 +26,7 @@ public class Server {
         
         final Server server = new Server();
         server.startServer();
-        System.out.println("Server started, version 0.5-SNAPSHOT");
+        System.out.println("Server started, version 0.5");
         //Bind  a shutdown hook
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
diff --git a/bundle/howto.txt b/bundle/howto.txt
index 5ca53ebd..9ab0f079 100644
--- a/bundle/howto.txt
+++ b/bundle/howto.txt
@@ -1,8 +1,8 @@
 Simple guide on how to use the bundle in a testable OSGi container:
 - mvn pax:provision //to create and download the required bundles
 - osgi>exit
-- cp target/moquette-bundle-0.5-SNAPSHOT.jar runner/bundles/ //to move the broker bundle
+- cp target/moquette-bundle-0.5.jar runner/bundles/ //to move the broker bundle
 - mvn pax:provision //restart the OSGi container
-- osgi> install file:bundles/moquette-bundle-0.5-SNAPSHOT.jar 
+- osgi> install file:bundles/moquette-bundle-0.5.jar 
 - osgi> ss
 - osgi> start <num last bundle>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 111773e0..a2269e62 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -7,7 +7,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>moquette-bundle</artifactId>
diff --git a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java b/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
index b44f9b2b..9dba6eb9 100644
--- a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
+++ b/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
@@ -20,11 +20,11 @@ public class Activator implements BundleActivator {
     public void start(BundleContext bundleContext) throws Exception {
         server = new Server();
         server.startServer();
-        LOG.info("Moquette MQTT broker started, version 0.5-SNAPSHOT");
+        LOG.info("Moquette MQTT broker started, version 0.5");
     }
 
     public void stop(BundleContext bundleContext) throws Exception {
         server.stopServer();
-        LOG.info("Moquette MQTT broker stopped, version 0.5-SNAPSHOT");
+        LOG.info("Moquette MQTT broker stopped, version 0.5");
     }
 }
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 82e8a89f..a3c4591a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>distribution</artifactId>
diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh
index b1ea8e86..7247ee76 100644
--- a/distribution/src/main/scripts/moquette.sh
+++ b/distribution/src/main/scripts/moquette.sh
@@ -52,6 +52,5 @@ LOG_FILE=$MOQUETTE_HOME/config/moquette-log.properties
 #set MOQUETTE_SETTINGS="-Dprofiler.enabled=true -Dcache.level1.enabled=false -Dcache.level2.enabled=false"
 JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
 
-#$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT $ORIENTDB_SETTINGS -Dfile.encoding=UTF8 -Djava.util.logging.config.file="$LOG_FILE" -Dmoquette.config.file="$CONFIG_FILE" -Dmoquette.www.path="$WWW_PATH" -Dmoquette.build.number="@BUILD@" -cp "$ORIENTDB_HOME/lib/moquette-server-@VERSION@.jar:$ORIENTDB_HOME/lib/*" com.orientechnologies.orient.server.OServerMain
-$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -cp "$LOG_FILE:$MOQUETTE_HOME/lib/moquette-broker-0.5-SNAPSHOT.jar:$MOQUETTE_HOME/lib/*" org.dna.mqtt.moquette.server.Server
+$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -cp "$LOG_FILE:$MOQUETTE_HOME/lib/moquette-broker-0.5.jar:$MOQUETTE_HOME/lib/*" org.dna.mqtt.moquette.server.Server
 
diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml
index 5f5c4895..1d802551 100644
--- a/netty_parser/pom.xml
+++ b/netty_parser/pom.xml
@@ -7,7 +7,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>moquette-netty-parser</artifactId>
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
index 355ae3cc..6f5cc166 100644
--- a/parser_commons/pom.xml
+++ b/parser_commons/pom.xml
@@ -7,7 +7,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.5</version>
     </parent>
 
     <artifactId>moquette-parser-commons</artifactId>
diff --git a/pom.xml b/pom.xml
index cd1a1d1c..c9cc57dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>moquette-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5</version>
     <name>Moquette MQTT library</name>
     <url>http://code.google.com/p/moquette-mqtt/</url>