diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index c2af2c0..d1b5fae 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,10 @@
+Changes from 3.0.2 to 3.0.3
+---------------------------
+
+** Improvement
+    * Update to framework and main 3.0.3
+    * Update to gogo 0.6.1
+
 Changes from 3.0.1 to 3.0.2
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index 48fec12..b3f644e 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,19 @@
+Changes from 3.0.2 to 3.0.3
+---------------------------
+
+** Bug
+    * [FELIX-2548] - Resolver should use case sensitive indexing for capabilities
+    * [FELIX-2569] - Felix bundle classloader always delegates to parent loader in getResources()
+    * [FELIX-2589] - SecurityException "SecurityManager already installed" is thrown when calling Framework.init() multiple times with FRAMEWORK_SECURITY set
+    * [FELIX-2598] - Hang in Felix: thread owing a bundle lock waits for ever to lock it again
+    * [FELIX-2599] - When specifying the packages exported by the system bundle, attributes and directives on packages do not show up in the system bundle headers
+
+** Improvement
+    * [FELIX-1022] - Classloader Exceptions should be more informative
+    * [FELIX-2549] - Fix some synchronization issues in content handling
+    * [FELIX-2555] - Log messages should contain the bundle id, when available
+    * [FELIX-2597] - Deadlock during delivery of resolved event
+
 Changes from 3.0.1 to 3.0.2
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_gogo.txt b/main.distribution/doc/changelog_gogo.command.txt
similarity index 69%
rename from main.distribution/doc/changelog_gogo.txt
rename to main.distribution/doc/changelog_gogo.command.txt
index 91accb0..0dbddff 100644
--- a/main.distribution/doc/changelog_gogo.txt
+++ b/main.distribution/doc/changelog_gogo.command.txt
@@ -1,13 +1,23 @@
-Release Notes gogo 0.6.0
-------------------------
+Changes from 0.6.0 to 0.6.1
+---------------------------
+
+* Import Gogo packages with mandatory attribute.
+
+Gogo Command 0.6.0
+------------------
 
 ** Bug
-    * [FELIX-1473] - [gogo] The syntax does not provide a way to call methods on a string
+    * [FELIX-1473] - [gogo] The syntax does not provide a way to call
+      methods on a string
     * [FELIX-1474] - [gogo] result of commands is implicitly written to pipe
-    * [FELIX-1493] - [gogo] automatic expansion of $args in Closure stops direct access to $args list
-    * [FELIX-2337] - [gogo] no way to access array[] elements produced by assignment
-    * [FELIX-2375] - [gogo] when supplied args can't be coerced, the error message prints the arg values, rather than their types
-    * [FELIX-2380] - [gogo] lock contention in piped writer when reader doesn't read all input
+    * [FELIX-1493] - [gogo] automatic expansion of $args in Closure stops
+      direct access to $args list
+    * [FELIX-2337] - [gogo] no way to access array[] elements produced by
+      assignment
+    * [FELIX-2375] - [gogo] when supplied args can't be coerced, the error
+      message prints the arg values, rather than their types
+    * [FELIX-2380] - [gogo] lock contention in piped writer when reader
+      doesn't read all input
 
 ** Improvement
     * [FELIX-1487] - Support for commands on multiple lines
@@ -16,10 +26,12 @@
     * [FELIX-2342] - [gogo] remove old felix command adaptor
 
 ** New Feature
-    * [FELIX-2363] - [Gogo] Add annotations for creating commands with optional and out-of-order arguments
+    * [FELIX-2363] - [Gogo] Add annotations for creating commands with
+      optional and out-of-order arguments
 
 ** Task
     * [FELIX-1670] - [gogo] launcher bundle not required
     * [FELIX-1889] - Gogo should depend on the official OSGi jars
     * [FELIX-2334] - [Gogo] Use org.apache.felix as Maven groupId
-    * [FELIX-2367] - [Gogo] Use org.apache.felix namespace to avoid any perceived legal issues
+    * [FELIX-2367] - [Gogo] Use org.apache.felix namespace to avoid any
+      perceived legal issues
diff --git a/main.distribution/doc/changelog_gogo.runtime.txt b/main.distribution/doc/changelog_gogo.runtime.txt
new file mode 100644
index 0000000..13ec024
--- /dev/null
+++ b/main.distribution/doc/changelog_gogo.runtime.txt
@@ -0,0 +1,50 @@
+Changes 0.6.0 to 0.6.1
+----------------------
+
+** Bug
+    * [FELIX-1473] - [gogo] The syntax does not provide a way to call
+      methods on a string
+    * [FELIX-2432] - [gogo] NPE/coercion failure when null first parameter
+      to method expecting arry
+    * [FELIX-2545] - [gogo] runtime should close all open sessions when it
+      is stopped
+    * [FELIX-2606] - Gogo isn't decoupled from OSGi anymore
+
+** Improvement
+    * [FELIX-2396] - Ability to have callbacks when accessing session variables
+    * [FELIX-2433] - [gogo] allow command expansion inside double quotes
+    * [FELIX-2607] - Introduce a specific exception when a command is not
+      foundGogo Runtime 0.6.1
+
+Gogo Runtime 0.6.0
+------------------
+
+** Bug
+    * [FELIX-1473] - [gogo] The syntax does not provide a way to call methods
+      on a string
+    * [FELIX-1474] - [gogo] result of commands is implicitly written to pipe
+    * [FELIX-1493] - [gogo] automatic expansion of $args in Closure stops
+      direct access to $args list
+    * [FELIX-2337] - [gogo] no way to access array[] elements produced by
+      assignment
+    * [FELIX-2375] - [gogo] when supplied args can't be coerced, the error
+      message prints the arg values, rather than their types
+    * [FELIX-2380] - [gogo] lock contention in piped writer when reader
+      doesn't read all input
+
+** Improvement
+    * [FELIX-1487] - Support for commands on multiple lines
+    * [FELIX-2328] - [gogo] tidy-up runtime to remove optional code etc
+    * [FELIX-2339] - [gogo] add support for running scripts
+    * [FELIX-2342] - [gogo] remove old felix command adaptor
+
+** New Feature
+    * [FELIX-2363] - [Gogo] Add annotations for creating commands with
+      optional and out-of-order arguments
+
+** Task
+    * [FELIX-1670] - [gogo] launcher bundle not required
+    * [FELIX-1889] - Gogo should depend on the official OSGi jars
+    * [FELIX-2334] - [Gogo] Use org.apache.felix as Maven groupId
+    * [FELIX-2367] - [Gogo] Use org.apache.felix namespace to avoid any
+      perceived legal issues
diff --git a/main.distribution/doc/changelog_gogo.shell.txt b/main.distribution/doc/changelog_gogo.shell.txt
new file mode 100644
index 0000000..f7bb05b
--- /dev/null
+++ b/main.distribution/doc/changelog_gogo.shell.txt
@@ -0,0 +1,46 @@
+Changes from 0.6.0 to 0.6.1
+---------------------------
+** Bug
+    * [FELIX-2446] - [Gogo] The bundle context command is not used with a
+      scope in gosh_profile
+    * [FELIX-2477] - [gogo] shell procedural commands don't inherit closure
+      arguments
+
+** Improvement
+    * [FELIX-2445] - [Gogo] Default gosh_profile should be updated to use
+      system bundle to load java.lang.System
+    * [FELIX-2543] - [Gogo] Should avoid using System.getProperty() to get
+      configuration properties
+
+Gogo Shell 0.6.0
+----------------
+
+** Bug
+    * [FELIX-1473] - [gogo] The syntax does not provide a way to call methods
+      on a string
+    * [FELIX-1474] - [gogo] result of commands is implicitly written to pipe
+    * [FELIX-1493] - [gogo] automatic expansion of $args in Closure stops
+      direct access to $args list
+    * [FELIX-2337] - [gogo] no way to access array[] elements produced by
+      assignment
+    * [FELIX-2375] - [gogo] when supplied args can't be coerced, the error
+      message prints the arg values, rather than their types
+    * [FELIX-2380] - [gogo] lock contention in piped writer when reader
+      doesn't read all input
+
+** Improvement
+    * [FELIX-1487] - Support for commands on multiple lines
+    * [FELIX-2328] - [gogo] tidy-up runtime to remove optional code etc
+    * [FELIX-2339] - [gogo] add support for running scripts
+    * [FELIX-2342] - [gogo] remove old felix command adaptor
+
+** New Feature
+    * [FELIX-2363] - [Gogo] Add annotations for creating commands with
+      optional and out-of-order arguments
+
+** Task
+    * [FELIX-1670] - [gogo] launcher bundle not required
+    * [FELIX-1889] - Gogo should depend on the official OSGi jars
+    * [FELIX-2334] - [Gogo] Use org.apache.felix as Maven groupId
+    * [FELIX-2367] - [Gogo] Use org.apache.felix namespace to avoid any
+      perceived legal issues
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 4178b50..43b1a21 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,10 @@
+Changes from 3.0.2 to 3.0.3
+---------------------------
+
+** Improvement
+    * Update to latest framework version 3.0.3
+    * Update to gogo 0.6.1
+
 Changes from 3.0.1 to 3.0.2
 ---------------------------
 
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 801cf1e..c6b9036 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -29,10 +29,10 @@
   <artifactId>org.apache.felix.main.distribution</artifactId>
   <version>3.1.0-SNAPSHOT</version>
   <properties>
-    <framework.version>3.0.2</framework.version>
-    <gogo.runtime.version>0.6.0</gogo.runtime.version>
-    <gogo.shell.version>0.6.0</gogo.shell.version>
-    <gogo.command.version>0.6.0</gogo.command.version>
+    <framework.version>3.0.3</framework.version>
+    <gogo.runtime.version>0.6.1</gogo.runtime.version>
+    <gogo.shell.version>0.6.1</gogo.shell.version>
+    <gogo.command.version>0.6.1</gogo.command.version>
     <obr.version>1.6.2</obr.version>
   </properties>
   <build>