diff --git a/autogen.sh b/autogen.sh
index e65cb20..1654d91 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 # Copyright (c) 2002-2007
 #         The Xfce development team. All rights reserved.
 #
@@ -16,23 +14,12 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
 # substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-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}'`
+linguas=`ls po/*.po 2>/dev/null | awk 'BEGIN {FS="[./]"; ORS=" "} {print $2}'`
+if test -d .git; then
+  revision=`git log --pretty=format:%h -n 1`
 else
-  revision=""
+  revision="UNKNOWN"
 fi
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
diff --git a/configure.in.in b/configure.in.in
index 8fc23f4..d22a2d6 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,4 +1,3 @@
-dnl $Id$
 dnl
 dnl xfce4-taskmanager - A small taskmanager based on the Xfce 4 libraries.
 dnl
@@ -11,18 +10,19 @@ 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], [])
-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()])])
+m4_define([taskmanager_version_tag], [git])
+m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
 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_INIT([Xfce4 Taskmanager], [taskmanager_version], [http://bugzilla.xfce.org/], [xfce4-taskmanager],
+        [http://goodies.xfce.org/projects/applications/xfce4-taskmanager])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
-AC_REVISION([$Id$])
+AC_REVISION([$Id: configure.in.in 5430 2008-09-21 19:49:06Z mmassonnet $])
 
 dnl ***************************
 dnl *** Initialize automake ***
diff --git a/module.xml b/module.xml
new file mode 100644
index 0000000..00109eb
--- /dev/null
+++ b/module.xml
@@ -0,0 +1,13 @@
+<Project>
+	<name xml:lang="en">xfce4-taskmanager</name>
+	<shortdesc xml:lang="en">Small taskmanager for the Xfce desktop</shortdesc>
+	<homepage rdf:resource="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"/>
+	<mailing-list rdf:resource="http://foo-projects.org/mailman/listinfo/xfce"/>
+	<maintainer>
+		<foaf:Person>
+			<foaf:name>Mike Massonnet</foaf:name>
+			<foaf:mbox>mailto:mmassonnet@xfce.org</foaf:mbox>
+			<gnome:userid>mmassonnet</gnome:userid>
+		</foaf:Person>
+	</maintainer>
+</Project>
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index a60f797..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast be cs da de el en_GB es eu fi fr gl hu id ja lv nb nl pl pt_BR pt ru sv tr uk ur ur_PK vi zh_CN zh_TW