diff --git a/gogo/command/doc/changelog.txt b/gogo/command/doc/changelog.txt
index 91accb0..0dbddff 100644
--- a/gogo/command/doc/changelog.txt
+++ b/gogo/command/doc/changelog.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/gogo/runtime/doc/changelog.txt b/gogo/runtime/doc/changelog.txt
index 91accb0..13ec024 100644
--- a/gogo/runtime/doc/changelog.txt
+++ b/gogo/runtime/doc/changelog.txt
@@ -1,13 +1,36 @@
-Release Notes gogo 0.6.0
-------------------------
+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-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
+    * [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 +39,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/gogo/shell/doc/changelog.txt b/gogo/shell/doc/changelog.txt
index 91accb0..f7bb05b 100644
--- a/gogo/shell/doc/changelog.txt
+++ b/gogo/shell/doc/changelog.txt
@@ -1,13 +1,32 @@
-Release Notes gogo 0.6.0
-------------------------
+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-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 +35,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