diff --git a/all/pom.xml b/all/pom.xml
index 82a5e7e..bb805ca 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-all</artifactId>
diff --git a/avl-partition/pom.xml b/avl-partition/pom.xml
index 3ddbab6..4b9e6e1 100644
--- a/avl-partition/pom.xml
+++ b/avl-partition/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-avl-partition</artifactId>
diff --git a/core-annotations/pom.xml b/core-annotations/pom.xml
index dfa30a1..bf01804 100644
--- a/core-annotations/pom.xml
+++ b/core-annotations/pom.xml
@@ -3,7 +3,7 @@
     <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-annotations</artifactId>
diff --git a/core-api/pom.xml b/core-api/pom.xml
index 2ead56d..5ea429e 100644
--- a/core-api/pom.xml
+++ b/core-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-api</artifactId>
diff --git a/core-avl/pom.xml b/core-avl/pom.xml
index 1db6d79..c41b56f 100644
--- a/core-avl/pom.xml
+++ b/core-avl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-avl</artifactId>
diff --git a/core-constants/pom.xml b/core-constants/pom.xml
index 510b8a9..6f9c001 100644
--- a/core-constants/pom.xml
+++ b/core-constants/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-constants</artifactId>
diff --git a/core-entry/pom.xml b/core-entry/pom.xml
index 2c25441..9c75a06 100644
--- a/core-entry/pom.xml
+++ b/core-entry/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-entry</artifactId>
diff --git a/core-integ/pom.xml b/core-integ/pom.xml
index b308d36..d45347e 100644
--- a/core-integ/pom.xml
+++ b/core-integ/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-integ</artifactId>
diff --git a/core-jndi/pom.xml b/core-jndi/pom.xml
index c9a690d..54e30e1 100644
--- a/core-jndi/pom.xml
+++ b/core-jndi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core-jndi</artifactId>
diff --git a/core-mock/pom.xml b/core-mock/pom.xml
index b3e1f0f..5f324d1 100644
--- a/core-mock/pom.xml
+++ b/core-mock/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>apacheds-core-mock</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index f4bd953..545bcb0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-core</artifactId>
diff --git a/default-config/pom.xml b/default-config/pom.xml
index 6ebe17a..aad38e1 100644
--- a/default-config/pom.xml
+++ b/default-config/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-integration/pom.xml b/http-integration/pom.xml
index 67b066b..4d66e0c 100644
--- a/http-integration/pom.xml
+++ b/http-integration/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 2ead3e5..a3add8c 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.directory.server</groupId>
diff --git a/interceptor-kerberos/pom.xml b/interceptor-kerberos/pom.xml
index 569a749..71b41f8 100644
--- a/interceptor-kerberos/pom.xml
+++ b/interceptor-kerberos/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-interceptor-kerberos</artifactId>
diff --git a/jdbm-partition/pom.xml b/jdbm-partition/pom.xml
index dbec58c..53ca0c3 100644
--- a/jdbm-partition/pom.xml
+++ b/jdbm-partition/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-jdbm-partition</artifactId>
diff --git a/jdbm-store/pom.xml b/jdbm-store/pom.xml
index 9eff068..baa23fd 100644
--- a/jdbm-store/pom.xml
+++ b/jdbm-store/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-jdbm-store</artifactId>
diff --git a/jdbm/pom.xml b/jdbm/pom.xml
index e9ee43a..95a4e7c 100644
--- a/jdbm/pom.xml
+++ b/jdbm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-jdbm</artifactId>
diff --git a/kerberos-shared/pom.xml b/kerberos-shared/pom.xml
index 418b012..b198a26 100644
--- a/kerberos-shared/pom.xml
+++ b/kerberos-shared/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-kerberos-shared</artifactId>
diff --git a/kerberos-test/pom.xml b/kerberos-test/pom.xml
index ed77d61..8e28e42 100644
--- a/kerberos-test/pom.xml
+++ b/kerberos-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-kerberos-test</artifactId>
diff --git a/ldif-partition/pom.xml b/ldif-partition/pom.xml
index ed45138..26e7c50 100644
--- a/ldif-partition/pom.xml
+++ b/ldif-partition/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-ldif-partition</artifactId>
diff --git a/pom.xml b/pom.xml
index a5b2553..0dec749 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-parent</artifactId>
-  <version>1.5.7</version>
+  <version>1.5.8-SNAPSHOT</version>
   <name>ApacheDS</name>
   <packaging>pom</packaging>
 
@@ -666,8 +666,8 @@
   </reporting>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/apacheds/tags/1.5.7</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/apacheds/tags/1.5.7</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/apacheds/tags/1.5.7</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-1.5.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-1.5.7</developerConnection>
+    <url>http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-1.5.7</url>
   </scm>
 </project>
diff --git a/protocol-changepw/pom.xml b/protocol-changepw/pom.xml
index a3b56aa..7599540 100644
--- a/protocol-changepw/pom.xml
+++ b/protocol-changepw/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-changepw</artifactId>
diff --git a/protocol-dhcp/pom.xml b/protocol-dhcp/pom.xml
index 05c5e04..fc2ad48 100644
--- a/protocol-dhcp/pom.xml
+++ b/protocol-dhcp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-dhcp</artifactId>
diff --git a/protocol-dns/pom.xml b/protocol-dns/pom.xml
index bce5967..3d2eae7 100644
--- a/protocol-dns/pom.xml
+++ b/protocol-dns/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-dns</artifactId>
diff --git a/protocol-kerberos/pom.xml b/protocol-kerberos/pom.xml
index ec42761..c310b9e 100644
--- a/protocol-kerberos/pom.xml
+++ b/protocol-kerberos/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.directory.server</groupId>  
diff --git a/protocol-ldap/pom.xml b/protocol-ldap/pom.xml
index 6ef0125..c486335 100644
--- a/protocol-ldap/pom.xml
+++ b/protocol-ldap/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-ldap</artifactId>
 
diff --git a/protocol-ntp/pom.xml b/protocol-ntp/pom.xml
index 6c3d10d..52448a7 100644
--- a/protocol-ntp/pom.xml
+++ b/protocol-ntp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-ntp</artifactId>
diff --git a/protocol-shared/pom.xml b/protocol-shared/pom.xml
index d0817b8..c937a37 100644
--- a/protocol-shared/pom.xml
+++ b/protocol-shared/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.directory.server</groupId>
diff --git a/server-annotations/pom.xml b/server-annotations/pom.xml
index 3f79369..60e9616 100644
--- a/server-annotations/pom.xml
+++ b/server-annotations/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-annotations</artifactId>
diff --git a/server-integ/pom.xml b/server-integ/pom.xml
index 8440000..cc0f089 100644
--- a/server-integ/pom.xml
+++ b/server-integ/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-integ</artifactId>
diff --git a/server-jndi/pom.xml b/server-jndi/pom.xml
index f3becb7..4317196 100644
--- a/server-jndi/pom.xml
+++ b/server-jndi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-jndi</artifactId>
diff --git a/server-replication/pom.xml b/server-replication/pom.xml
index 4fa5562..9683f57 100644
--- a/server-replication/pom.xml
+++ b/server-replication/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-replication</artifactId>
diff --git a/server-tools/pom.xml b/server-tools/pom.xml
index f688e3e..8638742 100644
--- a/server-tools/pom.xml
+++ b/server-tools/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-tools</artifactId>
diff --git a/server-xml/pom.xml b/server-xml/pom.xml
index 93f166f..98c1ebe 100644
--- a/server-xml/pom.xml
+++ b/server-xml/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-xml</artifactId>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 84f43e7..d86e22b 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -3,7 +3,7 @@
     <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-test-framework</artifactId>
diff --git a/utils/pom.xml b/utils/pom.xml
index f9f0509..b0984c0 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-utils</artifactId>
diff --git a/xbean-spring/pom.xml b/xbean-spring/pom.xml
index 0c1c1ffc..adbfdee 100644
--- a/xbean-spring/pom.xml
+++ b/xbean-spring/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apacheds-parent</artifactId>
     <groupId>org.apache.directory.server</groupId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/xdbm-base/pom.xml b/xdbm-base/pom.xml
index 2e0f185..301ae38 100644
--- a/xdbm-base/pom.xml
+++ b/xdbm-base/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-xdbm-base</artifactId>
diff --git a/xdbm-search/pom.xml b/xdbm-search/pom.xml
index a5bee6b..0b64b27 100644
--- a/xdbm-search/pom.xml
+++ b/xdbm-search/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-xdbm-search</artifactId>
diff --git a/xdbm-tools/pom.xml b/xdbm-tools/pom.xml
index f6eb078..5d1f56e 100644
--- a/xdbm-tools/pom.xml
+++ b/xdbm-tools/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-xdbm-tools</artifactId>
   <name>ApacheDS Generalized (X) DBM Tools</name>