diff --git a/ChangeLog b/ChangeLog
index 3938908..2dbc510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
+2008-05-11	Mike Massonnet <mmassonnet@xfce.org>
+
+=== Release 0.4.0 ===
+
+2008-05-11	Mike Massonnet <mmassonnet@xfce.org>
+
+	* Set window icon to "xfce-system" and modify the about dialog
+
+2008-05-10	Mike Massonnet <mmassonnet@xfce.org>
+
+	* Redo what is displayed in More info (PPID, STATE, VM-size), and keep RSS
+	  in normal info
+
+2008-05-10	Mike Massonnet <mmassonnet@xfce.org>
+
+	* Set buffer_status to 1024 (fixes issues with 64bit archs) bug#4059
+	* Use convenience macro GINT_TO_POINTER to pass to user_data
+
 2008-05-09	Mike Massonnet <mmassonnet@xfce.org>
 
+	* Properly refresh the CPU usage of a process
 	* Properly display the memory usage and fix signal connected on the
 	  show_cached_as_free menu item
 
@@ -29,6 +48,11 @@
 	* Delete automated files
 	* Remove useless gettext() and properly align menu items on the right
 
+2008-02-10	Johannes Zellner <webmaster@nebulon.de>
+
+	* Initial priority setting
+	* Few bug fixes
+
 2007-01-12	Nick Schermer <nick@xfce.org>
 
 	* Change version number and svn revision support in configure.in.in
diff --git a/NEWS b/NEWS
index e69de29..0197947 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,9 @@
+0.4.0
+
+[ Mike Massonnet <mmassonnet@xfce.org> ]
+- 64bit archs fix (#4059)
+- Clean up and bug fixes
+- Update strings
+
+[ Johannes Zellner <webmaster@nebulon.de> ]
+- Priority setting
diff --git a/TODO b/TODO
index 5a54519..d6ddcf8 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
++ menu to check the columns to display instead of normal/more info
 + *BSD support with the 'kvm' files
 + ability to switch to a tree-store
 + sending custom signals
-+ overall-cpu-usage and mem-usage display
-+ more languages
 + tray-icon
-
-* show 'Mb' in the memory columns
diff --git a/autogen.sh b/autogen.sh
index 01373b9..e65cb20 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,7 +27,13 @@ EOF
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+if test -d .git/svn; then
+  revision=`LC_ALL=C git-svn find-rev remotes/trunk`
+elif test -f .svn; then
+  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+else
+  revision=""
+fi
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
diff --git a/configure.in.in b/configure.in.in
index 8c0c6a3..edf897a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,16 +8,16 @@ dnl ***************************
 dnl *** Version information ***
 dnl ***************************
 m4_define([taskmanager_version_major], [0])
-m4_define([taskmanager_version_minor], [3])
-m4_define([taskmanager_version_micro], [2])
+m4_define([taskmanager_version_minor], [4])
+m4_define([taskmanager_version_micro], [0])
 m4_define([taskmanager_version_build], [r@REVISION@])
-m4_define([taskmanager_version_tag], [svn])
+m4_define([taskmanager_version_tag], [])
 m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [svn], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2007
+AC_COPYRIGHT([Copyright (c) 2006-2008
         The Xfce development team. All rights reserved.])
 AC_INIT([xfce4-taskmanager], [taskmanager_version], [http://bugzilla.xfce.org/], [xfce4-taskmanager])
 AC_PREREQ([2.50])
@@ -67,8 +67,8 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.2.0])
 
 dnl ***********************************
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3207314..49dbc3e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+xfce4-taskmanager.desktop.in
 src/callbacks.c
 src/functions.c
 src/interface.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..b79e8b5
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,2 @@
+src/menu-positions.c
+src/xfce-taskmanager-linux.c