diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 3c0cee5..e0b748b 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 4.0.0 to 4.0.1
+---------------------------
+
+** Improvement
+    * Update to framework and mian 4.0.1
+
 Changes from 3.2.2 to 4.0.0
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index d486a11..79e58db 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,15 @@
+Changes from 4.0.0 to 4.0.1
+---------------------------
+
+** Bug
+    * [FELIX-3137] - [Framework] Capabilities from resolved singleton bundles are not indexed correctly
+    * [FELIX-3150] - Filter parameter is ignored at getServiceReferences
+    * [FELIX-3153] - [Framework] refreshPackages() should stop bundles in one pass and refresh them in a second pass
+
+** Improvement
+    * [FELIX-3138] - [Framework] Refactor some unnecessary code in the resolver
+    * [FELIX-3141] - [Framework] Framework should filter removal pending fragments not the resolver
+
 Changes from 3.2.2 to 4.0.0
 ---------------------------
 
@@ -20,7 +32,6 @@
     * [FELIX-2950] - [Framework] Adopt OSGi R4.3 API as framework internal API
     * [FELIX-2998] - [Framework] OSGi R4.3 changed filter handling of exceptions when calling equals()/compare() to return false
     * [FELIX-3000] - Move sending service registered event out of bundle lock
-    * [FELIX-3035] - Make Felix version a compile time constant
     * [FELIX-3071] - [Framework] It should be possible to limit number of open JAR files
     * [FELIX-3125] - [Framework] Use single file per bundle in bundle cache by default
 
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index f87a901..8e9e9c3 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,5 +1,12 @@
+Changes from 4.0.0 to 4.0.1
+---------------------------
+
+** Improvement
+    * Update to latest framework version 4.0.1
+
 Changes from 3.2.2 to 4.0.0
 ---------------------------
+
 ** Improvement
     * [FELIX-3094] - [Main] Launcher should attempt to restart framework if the system bundle was updated
     * [FELIX-3123] - [Main] Integrate OBR 1.6.6
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index a850129..e90ca73 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -30,7 +30,7 @@
   <version>4.1.0-SNAPSHOT</version>
   <properties>
     <dollar>$</dollar>
-    <framework.version>4.1.0-SNAPSHOT</framework.version>
+    <framework.version>4.0.1</framework.version>
     <gogo.runtime.version>0.10.0</gogo.runtime.version>
     <gogo.shell.version>0.10.0</gogo.shell.version>
     <gogo.command.version>0.12.0</gogo.command.version>