diff --git a/AUTHORS b/AUTHORS
index b3dd37b1388d9517e022b8bf2bcaedd7e204d5c9..3fc67833e522dc89be970026e6e75cef16e400e3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ Nikos Kouremenos (kourem AT gmail.com)
 Dimitur Kirov (dkirov AT gmail.com)
 Travis Shirk (travis AT pobox.com)
 Jean-Marie Traissard (jim AT lapin.org)
+Stefan Bethge (stefan AT lanpartei.de)
 
 PAST DEVELOPERS:
 
diff --git a/Makefile.am b/Makefile.am
index 9eebf1f33e49f63e3dd54e10eb329b1029982037..779b8aa5022dbf1048faab093eec9e484ac8273c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,3 +24,20 @@ DISTCLEANFILES = 		\
 	intltool-merge 		\
 	intltool-update		\
 	scripts/gajim
+
+MAINTAINERCLEANFILES = \
+	configure \
+	Makefile.in \
+	intltool-extract.in \
+	intltool-update.in \
+	intltool-merge.in \
+	ltmain.sh \
+	missing \
+	mkinstalldirs \
+	install-sh \
+	compile \
+	depcomp \
+	config.guess \
+	config.sub \
+	aclocal.m4 \
+	libtool
diff --git a/autogen.sh b/autogen.sh
index da4108d45adab68b0ffb14b97e250a8d9b25c1d5..dee45c0ab9f4ddbfbd66ee094257555a1dfc5ed1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-set -x
   echo "[encoding: UTF-8]" > po/POTFILES.in \
   && ls data/gajim.desktop.in.in data/glade/*.glade \
   src/*py src/common/*py src/common/zeroconf/*.py -1 -U >> \
   po/POTFILES.in || exit 1
+  set -x
   intltoolize --force --automake \
   && aclocal -I ./m4 \
   && libtoolize --copy --force --automake \
diff --git a/configure.ac b/configure.ac
index 3ab972e34548316b9267ef1b7b64383d4cde2cec..d3349098248b2be90e78c9c76585687c07de48d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
 		[0.11.0],[http://trac.gajim.org/],[gajim])
+AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADER(config.h)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index d57cd6a133cf56b819bbffff9bc9bb758f8a11e7..1e92a0a329f63de0b400de66ab40f833da36ce01 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,3 +22,5 @@ EXTRA_DIST = $(desktop_in_files) \
 DISTCLEANFILES = $(desktop_DATA)
 
 CLEANFILES = gajim.desktop
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/emoticons/Makefile.am b/data/emoticons/Makefile.am
index 463c36e5a96e3357138810da63a16dd121acd2c5..c3feaf5853699f2e85da75fc1cfc2bb985154474 100644
--- a/data/emoticons/Makefile.am
+++ b/data/emoticons/Makefile.am
@@ -33,4 +33,6 @@ dist-hook:
 			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
 			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
 		fi; \
-	done; 
+	done;
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
index 64e112f7bdc045d28c6ee496dda6cd11fafb6cd8..a8b810da5b598cd1ed9286fe165d0cf32f73f757 100644
--- a/data/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -4,3 +4,5 @@ glade_DATA = $(srcdir)/*.glade
 EXTRA_DIST = $(glade_DATA)
 
 DISTCLEANFILES = *.h
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/iconsets/Makefile.am b/data/iconsets/Makefile.am
index 547b110b8743759d4b948ca9078ea6b42a8ff2b6..6dbd09b71d805cd07732311b15b67ce99d350ad9 100644
--- a/data/iconsets/Makefile.am
+++ b/data/iconsets/Makefile.am
@@ -34,4 +34,6 @@ dist-hook:
 			echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \
 			cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \
 		fi; \
-	done; 
+	done;
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 868898df9866377372e292a4c1eda50338f55eaf..7b06c34ad5d1c97b6485e01831955a60acf0c1e4 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -4,3 +4,5 @@ pixmaps_DATA = $(srcdir)/*.png \
 			   $(srcdir)/events/*.png \
 			   $(srcdir)/agents/*.png
 EXTRA_DIST = $(pixmaps_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 98fd6a15f420d6d1b6eb0937cb2b47c6062ed4f2..3ebe37a2d01df990e162b9435879760c633d7390 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,10 @@ trayicon_la_LIBADD = $(PYGTK_LIBS)
 trayicon_la_SOURCES = \
 					  eggtrayicon.c \
 					  trayiconmodule.c
+
 nodist_trayicon_la_SOURCES = \
 					trayicon.c
+
 trayicon_la_LDFLAGS = \
 	-module -avoid-version 
 trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
@@ -66,3 +68,4 @@ EXTRA_DIST = $(gajimsrc_DATA) \
 			trayicon.defs \
 			trayicon.override
 
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 2f22417ab672ec9456bb76b3304fd031a38cb1bc..18f4cb79632f92b38ac8bed864abe7e6a6cac5e8 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -14,3 +14,5 @@ idle_la_LDFLAGS = \
 
 idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES)
 endif
+
+MAINTAINERCLEANFILES = Makefile.in