diff --git a/AUTHORS b/AUTHORS
index af5474a..f95fd0c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,4 @@
 Sascha Kruse (http://github.com/knopwob)
 
 contributors:
-Gergely Nagy (http://github.com/algernon)
-Miles Sandlar (https://github.com/mil)
-Michael Stapelberg (https://github.com/mstap)
+See `git shortlog` for a list of contributors and their contributions
diff --git a/CHANGELOG b/CHANGELOG
index b8fa119..7c3f09c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,15 @@
-NEXT:
+v0.4.0:
+    - separator between notifications
+    - word wrap long lines
+    - real transparance
+    - bouncing text (alternative to word_wrap)
+    - new option for line height
+    - better multihead support
+    - don't die when keybindings can't be grabbed
+    - bugfix: forgetting geometry
     - (optional) static configuration
+v0.3.1:
+    - fix -mon option
 v0.3.0:
     - full support for Desktop Notification Specification (mandatory parts)
     - option to select monitor on which notifications are shown
diff --git a/RELEASE_NOTES.0.4.0 b/RELEASE_NOTES.0.4.0
new file mode 100644
index 0000000..3a7a43c
--- /dev/null
+++ b/RELEASE_NOTES.0.4.0
@@ -0,0 +1,17 @@
+Release Notes For v0.4.0
+
+Since dunst has lost its ability to show notifications independend of
+dbus/libnotify a long time ago I think it is time that the describtion reflects
+that. Even though this breaks the acronym. So if you're a packager please update
+the package description to read something like:
+
+short:
+"Dunst - a dmenu-ish notification-daemon"
+
+long:
+"Dunst is a highly configurable and lightweight notification-daemon"
+
+Release Tarballs are now available at:
+http://www.knopwob.org/public/dunst-release/
+
+For more information have a look at the CHANGELOG and the new options in dunstrc.
diff --git a/config.mk b/config.mk
index b7fecf1..9a62dcc 100644
--- a/config.mk
+++ b/config.mk
@@ -2,7 +2,11 @@
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
-VERSION= $(shell git describe)
+# In dist tarballs, the version is stored in the VERSION files.
+VERSION := '$(shell [ -f VERSION ] && cat VERSION)'
+ifeq ('',$(VERSION))
+VERSION := $(shell git describe)
+endif
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib