diff --git a/benchmarking/pom.xml b/benchmarking/pom.xml
index 054bf747..f70a5ce9 100644
--- a/benchmarking/pom.xml
+++ b/benchmarking/pom.xml
@@ -3,10 +3,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
+        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>${moquette-version}</version>
+        <version>0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>moquette-benchmark</artifactId>
diff --git a/broker/pom.xml b/broker/pom.xml
index 4cebbb11..f5d637ab 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -3,15 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
+        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>${moquette-version}</version>
+        <version>0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
     <packaging>jar</packaging>
-    <version>${moquette-version}</version>
+    <!--<version>${moquette-version}</version>-->
     <name>Moquette - broker</name>
 
     <properties>
@@ -22,13 +23,13 @@
         <dependency>
             <groupId>org.dna.mqtt</groupId>
             <artifactId>moquette-mina-parser</artifactId>
-            <version>${moquette-version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.dna.mqtt</groupId>
             <artifactId>moquette-netty-parser</artifactId>
-            <version>${moquette-version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml
index 5631fdf0..3e1bee64 100644
--- a/netty_parser/pom.xml
+++ b/netty_parser/pom.xml
@@ -3,15 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
+        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>${moquette-version}</version>
+        <version>0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>moquette-netty-parser</artifactId>
     <packaging>jar</packaging>
-    <version>${moquette-version}</version>
+    <!--<version>${moquette-version}</version>-->
     <name>Moquette - Netty Parser</name>
 
     <properties>
diff --git a/parser/pom.xml b/parser/pom.xml
index 436e819b..371f930d 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -3,15 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
+        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>${moquette-version}</version>
+        <version>0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>moquette-mina-parser</artifactId>
     <packaging>jar</packaging>
-    <version>${moquette-version}</version>
+    <!--<version>${moquette-version}</version>-->
     <name>Moquette - MINA Parser</name>
 
     <properties>
@@ -28,7 +29,7 @@
         <dependency>
             <groupId>org.dna.mqtt</groupId>
             <artifactId>moquette-parser-commons</artifactId>
-            <version>${moquette-version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml
index 587a1bce..3a0af7c4 100644
--- a/parser_commons/pom.xml
+++ b/parser_commons/pom.xml
@@ -3,15 +3,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../</relativePath>
+        <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
         <groupId>org.dna.mqtt</groupId>
-        <version>${moquette-version}</version>
+        <version>0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>moquette-parser-commons</artifactId>
     <packaging>jar</packaging>
-    <version>${moquette-version}</version>
+    <!--<version>${moquette-version}</version>-->
     <name>Moquette - Parser Commons</name>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index f522297c..43f2ad18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <moquette-version>0.3</moquette-version>
         <mina-version>2.0.7</mina-version>
     </properties>
     
@@ -11,7 +10,7 @@
     <artifactId>moquette-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>${moquette-version}</version>
+    <version>0.4-SNAPSHOT</version>
     <name>Moquette MQTT library</name>
     <url>http://code.google.com/p/moquette-mqtt/</url>
 
@@ -22,7 +21,6 @@
         <module>netty_parser</module>
         <module>broker</module>
         <module>benchmarking</module>
-        <!--module>distribution</module-->
     </modules>