diff --git a/Makefile.am b/Makefile.am
index 36783955e87f05843e509890d5b907593ea06380..9eebf1f33e49f63e3dd54e10eb329b1029982037 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ commonfiles_DATA = COPYING	\
 				   THANKS	\
 				   AUTHORS
 
-EXTRA_DIST = config.rpath 			\
+EXTRA_DIST = \
 	$(commonfiles_DATA) \
 	autogen.sh			\
 	intltool-extract.in \
diff --git a/Makefile.in b/Makefile.in
index 23a41499fc808c420e08d6c932997183f42752e3..912f16ccae356e1322a51c450faf5039960092d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,10 +39,9 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure $(top_srcdir)/scripts/gajim.in \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS THANKS \
-	compile config.guess config.rpath config.sub depcomp \
-	install-sh ltmain.sh missing mkinstalldirs
+	$(top_srcdir)/configure $(top_srcdir)/scripts/gajim.in AUTHORS \
+	COPYING ChangeLog INSTALL NEWS THANKS compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-gettext.m4 \
@@ -274,7 +273,7 @@ commonfiles_DATA = COPYING	\
 				   THANKS	\
 				   AUTHORS
 
-EXTRA_DIST = config.rpath 			\
+EXTRA_DIST = \
 	$(commonfiles_DATA) \
 	autogen.sh			\
 	intltool-extract.in \
@@ -298,15 +297,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --gnu  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/data/Makefile.in b/data/Makefile.in
index 6c911b05f4f57a80caab5730f38c074205667cb8..3e0e22fcaf166f59d8c8799c365badef7351a0cf 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -278,9 +278,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  data/Makefile
+	  $(AUTOMAKE) --gnu  data/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/data/emoticons/Makefile.in b/data/emoticons/Makefile.in
index 7452a17ae992630792651916d084b56177ae25db..f0241ba71bf0cc017f1ea7bc0e153b5cd93e2f7e 100644
--- a/data/emoticons/Makefile.in
+++ b/data/emoticons/Makefile.in
@@ -251,9 +251,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/emoticons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/emoticons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  data/emoticons/Makefile
+	  $(AUTOMAKE) --gnu  data/emoticons/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/data/glade/Makefile.in b/data/glade/Makefile.in
index e470ffbb9996c350456c6d7c04eb063ee93dec93..cb349c9a7668568e34c1a7f020b18c8c1ac87bb9 100644
--- a/data/glade/Makefile.in
+++ b/data/glade/Makefile.in
@@ -251,9 +251,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/glade/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/glade/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  data/glade/Makefile
+	  $(AUTOMAKE) --gnu  data/glade/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/data/iconsets/Makefile.in b/data/iconsets/Makefile.in
index f818baaa86bd4846392bc2a2e99667ae371a0082..6c8e6d66bb9ba0dc3603f6d5e9e61359acf8a47c 100644
--- a/data/iconsets/Makefile.in
+++ b/data/iconsets/Makefile.in
@@ -255,9 +255,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/iconsets/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/iconsets/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  data/iconsets/Makefile
+	  $(AUTOMAKE) --gnu  data/iconsets/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in
index 4d1c4db9d69fd42884deee82dc7e83ce4683a3a3..47a31c65d555053b14013465e42e7729130fc20f 100644
--- a/data/pixmaps/Makefile.in
+++ b/data/pixmaps/Makefile.in
@@ -254,9 +254,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/pixmaps/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/pixmaps/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  data/pixmaps/Makefile
+	  $(AUTOMAKE) --gnu  data/pixmaps/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/Makefile.in b/src/Makefile.in
index 726d0b2c2d4599cd96da2a719efcadd6019b5103..ef89736478f7441241939e116b73fa168d08a208 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -357,9 +357,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	  $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index fae707d6fc73f2e618cb810efe4a0ac3808c8fc2..e7b6c70fb5cedacbb1de3f6f669df5708161e35c 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -277,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/common/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/common/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/common/Makefile
+	  $(AUTOMAKE) --gnu  src/common/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \