diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 240a78f..6af2315 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.5 to 3.0.6
+---------------------------
+
+** Improvement
+    * Update to framework and main 3.0.6
+
 Changes from 3.0.4 to 3.0.5
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index b45059d..c08dd22 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,16 @@
+Changes from 3.0.5 to 3.0.6
+---------------------------
+
+** Bug
+    * [FELIX-2670] - [Framework] Implicit boot delegation doesn't delegate for external code in all cases
+    * [FELIX-2683] - [Framework] Bundle last modified time is not persisted on deployment
+
+** Improvement
+    * [FELIX-2560] - Bundle URLs do not survive refreshes
+
+** New Feature
+    * [FELIX-2646] - [Framework] Locking could be used to prevent concurrent access to a single bundle cache
+
 Changes from 3.0.4 to 3.0.5
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index c52aaf2..b3a4f75 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,12 @@
+Changes from 3.0.5 to 3.0.6
+---------------------------
+
+** Improvement
+    * Update to latest framework version 3.0.6
+
+** New Feature
+    * [FELIX-2678] - Startlevel for bundles in auto.deploy.dir
+
 Changes from 3.0.4 to 3.0.5
 ---------------------------
 
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 15459fc..8097bc3 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>org.apache.felix.main.distribution</artifactId>
   <version>3.1.0-SNAPSHOT</version>
   <properties>
-    <framework.version>3.1.0-SNAPSHOT</framework.version>
+    <framework.version>3.0.6</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>