diff --git a/ChangeLog b/ChangeLog
index ae49d0e..377d4e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-12	Nick Schermer <nick@xfce.org>
+
+	* Change version number and svn revision support in configure.in.in
+
 2007-01-12	Nick Schermer <nick@xfce.org>
 
 	* Apply patch from Álvaro Lopes to fix CPU usage per task, with
diff --git a/configure.in.in b/configure.in.in
index 4e4d1bc..0df8cf9 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -7,7 +7,12 @@ dnl 2005-2007 Johannes Zellner <webmaster@nebulon.de>
 dnl ***************************
 dnl *** Version information ***
 dnl ***************************
-m4_define([taskmanager_version], [0.4.0-rc2])
+m4_define([taskmanager_version_major], [0])
+m4_define([taskmanager_version_minor], [4])
+m4_define([taskmanager_version_micro], [1])
+m4_define([taskmanager_version_build], [r@REVISION@])
+m4_define([taskmanager_version_tag], [svn])
+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 ***