diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 90ea877..710db94 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes form 3.0.0 to 3.0.1
+---------------------------
+
+** Improvement
+    * Update to framework and main 3.0.1
+
 Changes from 2.0.5 to 3.0.0
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index a95ad4a..f0a91e8 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.0 to 3.0.1
+---------------------------
+
+** Bug
+    * [FELIX-2401] - NPE in org.apache.felix.framework.FilterImpl.DictionaryCapability.getAttribute(String)
+
 Changes from 2.0.5 to 3.0.0
 ---------------------------
 ** Sub-task
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index df5e5d7..1fe3f8c 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.0 to 3.0.1
+---------------------------
+
+** Improvement
+    * Update to latest framework version 3.0.1
+
 Changes from 2.0.5 to 3.0.0
 ---------------------------
 
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 4f118c6..daa2776 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.1.0-SNAPSHOT</framework.version>
-    <gogo.runtime.version>0.7.0-SNAPSHOT</gogo.runtime.version>
-    <gogo.shell.version>0.7.0-SNAPSHOT</gogo.shell.version>
-    <gogo.command.version>0.7.0-SNAPSHOT</gogo.command.version>
+    <framework.version>3.0.1</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>
     <obr.version>1.6.2</obr.version>
   </properties>
   <build>