diff --git a/gogo/command/doc/changelog.txt b/gogo/command/doc/changelog.txt
new file mode 100644
index 0000000..91accb0
--- /dev/null
+++ b/gogo/command/doc/changelog.txt
@@ -0,0 +1,25 @@
+Release Notes gogo 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/gogo/runtime/doc/apache-felix-gogo-Dateien/apache.png b/gogo/runtime/doc/apache-felix-gogo-Dateien/apache.png
new file mode 100644
index 0000000..5132f65
--- /dev/null
+++ b/gogo/runtime/doc/apache-felix-gogo-Dateien/apache.png
Binary files differ
diff --git a/gogo/runtime/doc/apache-felix-gogo-Dateien/button.html b/gogo/runtime/doc/apache-felix-gogo-Dateien/button.html
new file mode 100644
index 0000000..8503c58
--- /dev/null
+++ b/gogo/runtime/doc/apache-felix-gogo-Dateien/button.html
@@ -0,0 +1,5 @@
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><!-- ads start -->
+</head><body><a href="http://www.us.apachecon.com/" target="_blank"><img src="button_data/2010-na-125x125.png" title="ApacheCon NA 2010" border="0" height="125" width="125"></a>
+<!-- ads end -->
+</body></html>
\ No newline at end of file
diff --git a/gogo/runtime/doc/apache-felix-gogo-Dateien/button_data/2010-na-125x125.png b/gogo/runtime/doc/apache-felix-gogo-Dateien/button_data/2010-na-125x125.png
new file mode 100644
index 0000000..90bd87b
--- /dev/null
+++ b/gogo/runtime/doc/apache-felix-gogo-Dateien/button_data/2010-na-125x125.png
Binary files differ
diff --git a/gogo/runtime/doc/apache-felix-gogo-Dateien/logo.png b/gogo/runtime/doc/apache-felix-gogo-Dateien/logo.png
new file mode 100644
index 0000000..dccbddc
--- /dev/null
+++ b/gogo/runtime/doc/apache-felix-gogo-Dateien/logo.png
Binary files differ
diff --git a/gogo/runtime/doc/apache-felix-gogo-Dateien/site.css b/gogo/runtime/doc/apache-felix-gogo-Dateien/site.css
new file mode 100644
index 0000000..959ab0a
--- /dev/null
+++ b/gogo/runtime/doc/apache-felix-gogo-Dateien/site.css
@@ -0,0 +1,25 @@
+/* @override http://felix.apache.org/site/media.data/site.css */
+
+body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial, sans-serif; font-size: 10pt; line-height: 140% }
+h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px}
+h1 { font-size: 200% }
+h2 { font-size: 175% }
+h3 { font-size: 150% }
+h4 { font-size: 140% }
+h5 { font-size: 130% }
+h6 { font-size: 120% }
+a { color: #1980af }
+a:visited { color: #1980af }
+a:hover { color: #1faae9 }
+.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x; background-position: bottom; }
+.logo { position: absolute; width: 15em; height: 81px; text-align: center; }
+.header { text-align: right; margin-right: 20pt; margin-top: 30pt;}
+.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left: 1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc }
+.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em; margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px; color: #4a4a43}
+.menu a { text-decoration: none; color: #4a4a43 }
+.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left: 15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em; padding-top: 1em;}
+.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em }
+.code-keyword { color: #880000 }
+.code-quote { color: #008800 }
+.code-object { color: #0000dd }
+.code-java { margin: 0em }
\ No newline at end of file
diff --git a/gogo/runtime/doc/apache-felix-gogo.html b/gogo/runtime/doc/apache-felix-gogo.html
new file mode 100644
index 0000000..3d18fe2
--- /dev/null
+++ b/gogo/runtime/doc/apache-felix-gogo.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html><head>
+
+
+  
+    <title>Apache Felix - Apache Felix Gogo</title>
+    <link rel="stylesheet" href="apache-felix-gogo-Dateien/site.css" type="text/css" media="all">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head><body>
+    <div class="title"><div class="logo"><a href="http://felix.apache.org/site/index.html"><img alt="Apache Felix" src="apache-felix-gogo-Dateien/logo.png" border="0"></a></div><div class="header"><a href="http://www.apache.org/"><img alt="Apache" src="apache-felix-gogo-Dateien/apache.png" border="0"></a></div></div>
+    <div class="menu">
+<ul>
+	<li><a href="http://felix.apache.org/site/news.html" title="news">news</a></li>
+	<li><a href="http://felix.apache.org/site/license.html" title="license">license</a></li>
+	<li><a href="http://felix.apache.org/site/downloads.cgi" class="external-link" rel="nofollow">downloads</a></li>
+	<li><a href="http://felix.apache.org/site/documentation.html" title="documentation">documentation</a></li>
+	<li><a href="http://felix.apache.org/site/mailinglists.html" title="mailinglists">mailing lists</a></li>
+	<li><a href="http://felix.apache.org/site/contributing.html" title="Contributing">contributing</a></li>
+	<li><a href="http://www.apache.org/" class="external-link" rel="nofollow">asf</a></li>
+	<li><a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">sponsorship</a></li>
+	<li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">sponsors</a>
+<!-- ApacheCon Ad -->
+<iframe src="apache-felix-gogo-Dateien/button.html" style="border-width: 0pt; float: left;" frameborder="0" height="135" scrolling="no" width="135"></iframe>
+<p style="height: 100px;">
+<!-- ApacheCon Ad -->
+</p></li></ul>
+    </div>
+    <div class="main">
+<h1><a name="ApacheFelixGogo-ApacheFelixGogo"></a>Apache Felix Gogo</h1>
+
+<p>Apache Felix Gogo is a subproject of Apache Felix implementing the
+OSGi RFC 147, which describes a standard shell for OSGi-based
+environments. See <a href="http://felix.apache.org/site/rfc-147-overview.html" title="RFC 147 Overview">RFC 147 Overview</a> for more information.</p>
+
+<h2><a name="ApacheFelixGogo-UsingGogowiththeFelixFramework"></a>Using Gogo with the Felix Framework</h2>
+
+<p>The Gogo subproject consists of three bundles:</p>
+
+<ol>
+	<li><b>runtime</b> - implements the core command processing functionality.</li>
+	<li><b>shell</b> - provides a simple textual user interface to interact with the command processor.</li>
+	<li><b>command</b> - implements a set of basic commands.</li>
+</ol>
+
+
+<p>As of the Apache Felix Framework 3.0.0, Gogo is included as the
+default shell in the framework distribution. To use it, you just start
+the framework like normal:</p>
+
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
+<pre>$ cd felix-framework-3.0.0
+$ java -jar bin/felix.jar
+_______________
+Welcome to Apache Felix Gogo
+
+g! lb
+START LEVEL 1
+   ID|State      |Level|Name
+    0|Active     |    0|System Bundle (3.0.0)
+    1|Active     |    1|Apache Felix Bundle Repository (1.6.2)
+    2|Active     |    1|Apache Felix Gogo Command (0.6.0)
+    3|Active     |    1|Apache Felix Gogo Runtime (0.6.0)
+    4|Active     |    1|Apache Felix Gogo Shell (0.6.0)
+g! 
+</pre>
+</div></div>
+
+<p>Gogo shell integration in the framework distribution is also discussed in the <a href="http://felix.apache.org/site/apache-felix-framework-usage-documentation.html" title="Apache Felix Framework Usage Documentation">framework usage document</a></p>
+    </div>
+  </body></html>
\ No newline at end of file
diff --git a/gogo/runtime/doc/changelog.txt b/gogo/runtime/doc/changelog.txt
new file mode 100644
index 0000000..91accb0
--- /dev/null
+++ b/gogo/runtime/doc/changelog.txt
@@ -0,0 +1,25 @@
+Release Notes gogo 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/gogo/shell/doc/changelog.txt b/gogo/shell/doc/changelog.txt
new file mode 100644
index 0000000..91accb0
--- /dev/null
+++ b/gogo/shell/doc/changelog.txt
@@ -0,0 +1,25 @@
+Release Notes gogo 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