diff --git a/framework/pom.xml b/framework/pom.xml
index ec10c76..6fc2097 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -27,7 +27,7 @@
   <packaging>bundle</packaging>
   <name>Apache Felix Framework</name>
   <artifactId>org.apache.felix.framework</artifactId>
-  <version>5.5.0-SNAPSHOT</version>
+  <version>5.3.0-SNAPSHOT</version>
   <properties>
     <dollar>$</dollar>
     <felix.java.version>6</felix.java.version>
@@ -127,7 +127,7 @@
     <dependency>
        <groupId>org.apache.felix</groupId>
        <artifactId>org.apache.felix.resolver</artifactId>
-       <version>1.9.0-SNAPSHOT</version>
+       <version>1.8.0</version>
        <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index d616b1f..0260d05 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -4,7 +4,6 @@
 ** Improvement
     * Update to framework and main 5.4.0
     * Update to latest obr version 2.0.6
-    * Update to latest gogo shell 0.12.0
     * Update to latest gogo commands 0.16.0
 
 Changes from 5.0.1 to 5.2.0
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 635b4c2..05a9184 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -4,7 +4,6 @@
 ** Improvement
     * Update to latest framework version 5.4.0
     * Update to latest obr 2.0.6
-    * Update to latest gogo shell 0.12.0
     * Update to latest gogo command 0.16.0
 
 Changes from 5.0.1 to 5.2.0
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 179e56a..762806d 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -27,12 +27,12 @@
   <packaging>pom</packaging>
   <name>Apache Felix Main Distribution</name>
   <artifactId>org.apache.felix.main.distribution</artifactId>
-  <version>5.5.0-SNAPSHOT</version>
+  <version>5.3.0-SNAPSHOT</version>
   <properties>
     <dollar>$</dollar>
-    <framework.version>5.5.0-SNAPSHOT</framework.version>
+    <framework.version>5.4.0</framework.version>
     <gogo.runtime.version>0.16.2</gogo.runtime.version>
-    <gogo.shell.version>0.12.0</gogo.shell.version>
+    <gogo.shell.version>0.10.0</gogo.shell.version>
     <gogo.command.version>0.16.0</gogo.command.version>
     <obr.version>2.0.6</obr.version>
   </properties>
diff --git a/main/doc/changelog.txt b/main/doc/changelog.txt
index 635b4c2..05a9184 100644
--- a/main/doc/changelog.txt
+++ b/main/doc/changelog.txt
@@ -4,7 +4,6 @@
 ** Improvement
     * Update to latest framework version 5.4.0
     * Update to latest obr 2.0.6
-    * Update to latest gogo shell 0.12.0
     * Update to latest gogo command 0.16.0
 
 Changes from 5.0.1 to 5.2.0
diff --git a/main/pom.xml b/main/pom.xml
index 282d16e..5a9b114 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,7 +27,7 @@
   <packaging>bundle</packaging>
   <name>Apache Felix Main</name>
   <artifactId>org.apache.felix.main</artifactId>
-  <version>5.5.0-SNAPSHOT</version>
+  <version>5.3.0-SNAPSHOT</version>
     <scm>
       <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/main</connection>
       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/main</developerConnection>
@@ -37,14 +37,14 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>5.5.0-SNAPSHOT</version>
+      <version>5.4.0</version>
     </dependency>
   </dependencies>
   <properties>
     <log.level>4</log.level>
     <dollar>$</dollar>
     <gogo.runtime.version>0.16.2</gogo.runtime.version>
-    <gogo.shell.version>0.12.0</gogo.shell.version>
+    <gogo.shell.version>0.10.0</gogo.shell.version>
     <gogo.command.version>0.16.0</gogo.command.version>
     <obr.version>2.0.6</obr.version>
   </properties>
diff --git a/resolver/pom.xml b/resolver/pom.xml
index 1bc60c0..85cd1e7 100644
--- a/resolver/pom.xml
+++ b/resolver/pom.xml
@@ -29,7 +29,7 @@
   <description>
     Provide OSGi resolver service.
   </description>
-  <version>1.9.0-SNAPSHOT</version>
+  <version>1.7.0-SNAPSHOT</version>
   <artifactId>org.apache.felix.resolver</artifactId>
   <scm>
      <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/resolver</connection>