diff --git a/doc/changelog.txt b/doc/changelog.txt
index d1b5fae..e378885 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.3 to 3.0.4
+---------------------------
+
+** Improvement
+    * Update to framework and main 3.0.4
+
 Changes from 3.0.2 to 3.0.3
 ---------------------------
 
diff --git a/doc/changelog_framework.txt b/doc/changelog_framework.txt
index b3f644e..1984c8d 100644
--- a/doc/changelog_framework.txt
+++ b/doc/changelog_framework.txt
@@ -1,3 +1,14 @@
+Changes from 3.0.3 to 3.0.4
+---------------------------
+
+** Bug
+    * [FELIX-2584] - No FrameworkEvent.ERROR on unchecked exception in event listener
+    * [FELIX-2629] - [Framework] Module class loader should return an empty enumeration for getResources()
+
+** Improvement
+    * [FELIX-2619] - [Framework] Bundle cache is rechecking nonexistent files again and again
+    * [FELIX-2626] - [Framework] Bundle cache is rewriting some files when restarting bundles
+
 Changes from 3.0.2 to 3.0.3
 ---------------------------
 
diff --git a/doc/changelog_main.txt b/doc/changelog_main.txt
index 43b1a21..6f11898 100644
--- a/doc/changelog_main.txt
+++ b/doc/changelog_main.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.3 to 3.0.4
+---------------------------
+
+** Improvement
+    * Update to latest framework version 3.0.4
+
 Changes from 3.0.2 to 3.0.3
 ---------------------------
 
diff --git a/pom.xml b/pom.xml
index 15459fc..41ed017 100644
--- a/pom.xml
+++ b/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.4</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>