diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 07671f4..953b3f2 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 4.0.1 to 4.0.2
+---------------------------
+
+** Improvement
+    * Update to framework and main 4.0.2
+
 Changes from 4.0.0 to 4.0.1
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index 79e58db..4b31bc9 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,20 @@
+Changes from 4.0.1 to 4.0.2
+---------------------------
+
+** Bug
+    * [FELIX-3178] - NPE in ResolverImpl
+    * [FELIX-3194] - [Framework] Manifest parser is not correctly handling escapes
+    * [FELIX-3205] - Error resolving system.bundle dependencies
+    * [FELIX-3207] - Improper handling of nulls and substring matching at CapabilitySet/SimpleFilter
+    * [FELIX-3211] - org.apache.felix.framework.cache.BundleCache.deleteDirectoryTreeRecursive throws NPE
+    * [FELIX-3220] - Multiple ClassCastException(s) when invoking OSGi Service-Hooks (EventHook, FindHook)
+
+** Improvement
+    * [FELIX-3166] - Make Felix compile within Eclipse
+
+** New Feature
+    * [FELIX-3156] - Implement Bundle::getDataFile and Bundle::compareTo
+
 Changes from 4.0.0 to 4.0.1
 ---------------------------
 
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 8e9e9c3..64159d5 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,9 @@
+Changes from 4.0.1 to 4.0.2
+---------------------------
+
+** Improvement
+    * Update to latest framework version 4.0.2
+
 Changes from 4.0.0 to 4.0.1
 ---------------------------
 
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index a850129..d4c0777 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.2</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>