diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..c7cfcd238
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,10 @@
+## 0.4.0 / 2014-04-17
+
+* [FEATURE] Vectors and scalars may now be reversed in binary operations (`<scalar> <binop> <vector>`).
+* [FEATURE] It's possible to shutdown Prometheus via a `/-/quit` web endpoint now.
+* [BUGFIX] Fix for a deadlock race condition in the memory storage.
+* [BUGFIX] Mac OS X build fixed.
+* [BUGFIX] Built from Go 1.2.1, which has internal fixes to race conditions in garbage collection handling.
+* [ENHANCEMENT] Internal storage interface refactoring that allows building e.g. the `rule_checker` tool without LevelDB dynamic library dependencies.
+* [ENHANCEMENT] Cleanups around shutdown handling.
+* [PERFORMANCE] Preparations for better memory reuse during marshalling / unmarshalling.
diff --git a/VERSION b/VERSION
index 0d91a54c7..1d0ba9ea1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.0
+0.4.0