diff -Nru claws-mail-3.9.1/debian/changelog claws-mail-3.9.1/debian/changelog
--- claws-mail-3.9.1/debian/changelog	2013-05-07 23:19:39.000000000 +0000
+++ claws-mail-3.9.1/debian/changelog	2013-06-15 00:39:15.000000000 +0000
@@ -1,3 +1,9 @@
+claws-mail (3.9.1-1+rpi1) jessie-staging; urgency=low
+
+  * Add patch based on upstream commit to fix multiarch python issue.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 15 Jun 2013 00:38:58 +0000
+
 claws-mail (3.9.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru claws-mail-3.9.1/debian/patches/fix-multiarch-python.patch claws-mail-3.9.1/debian/patches/fix-multiarch-python.patch
--- claws-mail-3.9.1/debian/patches/fix-multiarch-python.patch	1970-01-01 00:00:00.000000000 +0000
+++ claws-mail-3.9.1/debian/patches/fix-multiarch-python.patch	2013-06-15 00:10:28.000000000 +0000
@@ -0,0 +1,1227 @@
+Description: Fix multiarch pythong
+ Base on new code from 
+ http://git.claws-mail.org/?p=claws.git;a=patch;h=df8a1d7e766dea1c48a47d6a7766e20922a78cab
+ .
+ Patch is messy due to regenerating autohell stuff :( 
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- claws-mail-3.9.1.orig/Makefile.in
++++ claws-mail-3.9.1/Makefile.in
+@@ -470,15 +470,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
++	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ 		&& exit 0; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign Makefile
++	  $(AUTOMAKE) --gnu Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/configure.ac
++++ claws-mail-3.9.1/configure.ac
+@@ -1225,20 +1225,29 @@ AM_PATH_PYTHON([2.5], [
+ 
+ 	if test x"$HAVE_PYTHON" = xyes; then
+ 		# libpython.so
+-		PYTHON_SO_FILE="libpython${PYTHON_VERSION}.so"
+-		found_libpython_so="no"
+-		if test -f "$PYTHON_PREFIX/lib/$PYTHON_SO_FILE"; then
+-			found_libpython_so="yes"
+-			PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib/$PYTHON_SO_FILE\"))"`
+-		fi
+-		if test -f "$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE"; then
+-			found_libpython_so="yes"
+-			PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE\"))"`
+-		fi
++		PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
++		_save_libs="$LIBS"
++		LIBS="-ldl"
++		AC_MSG_CHECKING([whether to dlopen $PYTHON_SHARED_LIB works])
++		AC_RUN_IFELSE(
++			[AC_LANG_PROGRAM(
++				[#include <dlfcn.h>
++				 #define PYTHON_SO_FILE "${PYTHON_SHARED_LIB}"
++				],
++			 	[if (!dlopen(PYTHON_SO_FILE, RTLD_NOW | RTLD_GLOBAL)) return 1; return 0;])
++			],
++			[found_libpython_so="yes"],
++			[found_libpython_so="no"],
++			[AC_MSG_FAILURE([cross-compiling not supported])])
+ 		if test x"$found_libpython_so" != x"yes"; then
++			AC_MSG_RESULT(no)
+ 			AC_MSG_WARN(Could not find Python shared libary: $PYTHON_SO_FILE does not exist. Maybe you need to install development packages for Python.)
+ 			HAVE_PYTHON=no
++		else
++			AC_MSG_RESULT(yes)
+ 		fi
++		LIBS="$_save_libs";
++
+ 	fi
+ 	if test x"$HAVE_PYTHON" = xyes; then
+ 		PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= 2.10.3, [AC_DEFINE(ENABLE_PYTHON, [1], [Enable Python support])], HAVE_PYTHON=no)
+--- claws-mail-3.9.1.orig/configure
++++ claws-mail-3.9.1/configure
+@@ -21618,21 +21618,52 @@ $as_echo "$as_me: WARNING: python-config
+ 
+ 	if test x"$HAVE_PYTHON" = xyes; then
+ 		# libpython.so
+-		PYTHON_SO_FILE="libpython${PYTHON_VERSION}.so"
+-		found_libpython_so="no"
+-		if test -f "$PYTHON_PREFIX/lib/$PYTHON_SO_FILE"; then
+-			found_libpython_so="yes"
+-			PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib/$PYTHON_SO_FILE\"))"`
+-		fi
+-		if test -f "$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE"; then
+-			found_libpython_so="yes"
+-			PYTHON_SHARED_LIB=`python -c "import os,sys; print os.path.basename(os.path.realpath(\"$PYTHON_PREFIX/lib64/$PYTHON_SO_FILE\"))"`
+-		fi
++		PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
++		_save_libs="$LIBS"
++		LIBS="-ldl"
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to dlopen $PYTHON_SHARED_LIB works" >&5
++$as_echo_n "checking whether to dlopen $PYTHON_SHARED_LIB works... " >&6; }
++		if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "cross-compiling not supported
++See \`config.log' for more details" "$LINENO" 5; }
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <dlfcn.h>
++				 #define PYTHON_SO_FILE "${PYTHON_SHARED_LIB}"
++
++int
++main ()
++{
++if (!dlopen(PYTHON_SO_FILE, RTLD_NOW | RTLD_GLOBAL)) return 1; return 0;
++  ;
++  return 0;
++}
++
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  found_libpython_so="yes"
++else
++  found_libpython_so="no"
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
+ 		if test x"$found_libpython_so" != x"yes"; then
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find Python shared libary: $PYTHON_SO_FILE does not exist. Maybe you need to install development packages for Python." >&5
+ $as_echo "$as_me: WARNING: Could not find Python shared libary: $PYTHON_SO_FILE does not exist. Maybe you need to install development packages for Python." >&2;}
+ 			HAVE_PYTHON=no
++		else
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ 		fi
++		LIBS="$_save_libs";
++
+ 	fi
+ 	if test x"$HAVE_PYTHON" = xyes; then
+ 
+--- claws-mail-3.9.1.orig/src/Makefile.in
++++ claws-mail-3.9.1/src/Makefile.in
+@@ -1102,9 +1102,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/Makefile
++	  $(AUTOMAKE) --gnu src/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/common/Makefile.in
++++ claws-mail-3.9.1/src/common/Makefile.in
+@@ -501,9 +501,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/common/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/common/Makefile'; \
+ 	$(am__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 \
+--- claws-mail-3.9.1.orig/src/plugins/Makefile.in
++++ claws-mail-3.9.1/src/plugins/Makefile.in
+@@ -404,9 +404,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/pgpcore/Makefile.in
++++ claws-mail-3.9.1/src/plugins/pgpcore/Makefile.in
+@@ -456,9 +456,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/pgpcore/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/pgpcore/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/pgpcore/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/pgpcore/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/fetchinfo/Makefile.in
++++ claws-mail-3.9.1/src/plugins/fetchinfo/Makefile.in
+@@ -433,9 +433,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/fetchinfo/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/fetchinfo/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/fetchinfo/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/fetchinfo/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/geolocation/Makefile.in
++++ claws-mail-3.9.1/src/plugins/geolocation/Makefile.in
+@@ -415,9 +415,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/geolocation/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/geolocation/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/geolocation/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/geolocation/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/gdata/Makefile.in
++++ claws-mail-3.9.1/src/plugins/gdata/Makefile.in
+@@ -417,9 +417,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/gdata/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/gdata/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/gdata/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/gdata/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/notification/Makefile.in
++++ claws-mail-3.9.1/src/plugins/notification/Makefile.in
+@@ -510,9 +510,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/notification/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/notification/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/notification/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/notification/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/notification/gtkhotkey/Makefile.in
++++ claws-mail-3.9.1/src/plugins/notification/gtkhotkey/Makefile.in
+@@ -430,9 +430,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/notification/gtkhotkey/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/notification/gtkhotkey/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/notification/gtkhotkey/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/notification/gtkhotkey/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/bsfilter/Makefile.in
++++ claws-mail-3.9.1/src/plugins/bsfilter/Makefile.in
+@@ -434,9 +434,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/bsfilter/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bsfilter/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/bsfilter/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/bsfilter/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/python/Makefile.in
++++ claws-mail-3.9.1/src/plugins/python/Makefile.in
+@@ -472,9 +472,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/python/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/python/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/python/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/python/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/python/examples/Makefile.in
++++ claws-mail-3.9.1/src/plugins/python/examples/Makefile.in
+@@ -345,9 +345,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/python/examples/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/python/examples/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/python/examples/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/python/examples/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/pgpmime/Makefile.in
++++ claws-mail-3.9.1/src/plugins/pgpmime/Makefile.in
+@@ -452,9 +452,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/pgpmime/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/pgpmime/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/pgpmime/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/pgpmime/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/rssyl/Makefile.in
++++ claws-mail-3.9.1/src/plugins/rssyl/Makefile.in
+@@ -448,9 +448,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/rssyl/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/rssyl/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/rssyl/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/rssyl/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/pdf_viewer/Makefile.in
++++ claws-mail-3.9.1/src/plugins/pdf_viewer/Makefile.in
+@@ -413,9 +413,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/pdf_viewer/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/pdf_viewer/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/pdf_viewer/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/pdf_viewer/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/newmail/Makefile.in
++++ claws-mail-3.9.1/src/plugins/newmail/Makefile.in
+@@ -406,9 +406,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/newmail/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/newmail/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/newmail/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/newmail/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/attachwarner/Makefile.in
++++ claws-mail-3.9.1/src/plugins/attachwarner/Makefile.in
+@@ -435,9 +435,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/attachwarner/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/attachwarner/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/attachwarner/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/attachwarner/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/demo/Makefile.in
++++ claws-mail-3.9.1/src/plugins/demo/Makefile.in
+@@ -409,9 +409,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/demo/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/demo/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/demo/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/demo/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/pgpinline/Makefile.in
++++ claws-mail-3.9.1/src/plugins/pgpinline/Makefile.in
+@@ -451,9 +451,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/pgpinline/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/pgpinline/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/pgpinline/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/pgpinline/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/mailmbox/Makefile.in
++++ claws-mail-3.9.1/src/plugins/mailmbox/Makefile.in
+@@ -456,9 +456,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/mailmbox/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/mailmbox/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/mailmbox/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/mailmbox/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/bogofilter/Makefile.in
++++ claws-mail-3.9.1/src/plugins/bogofilter/Makefile.in
+@@ -417,9 +417,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/bogofilter/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bogofilter/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/bogofilter/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/bogofilter/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/spam_report/Makefile.in
++++ claws-mail-3.9.1/src/plugins/spam_report/Makefile.in
+@@ -438,9 +438,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/spam_report/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/spam_report/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/spam_report/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/spam_report/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/vcalendar/Makefile.in
++++ claws-mail-3.9.1/src/plugins/vcalendar/Makefile.in
+@@ -495,9 +495,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/vcalendar/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/vcalendar/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/vcalendar/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/vcalendar/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/vcalendar/libical/Makefile.in
++++ claws-mail-3.9.1/src/plugins/vcalendar/libical/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/vcalendar/libical/libical/Makefile.in
++++ claws-mail-3.9.1/src/plugins/vcalendar/libical/libical/Makefile.in
+@@ -583,9 +583,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/libical/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/libical/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/libical/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/libical/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/vcalendar/libical/scripts/Makefile.in
++++ claws-mail-3.9.1/src/plugins/vcalendar/libical/scripts/Makefile.in
+@@ -344,9 +344,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/scripts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/scripts/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/scripts/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/scripts/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/vcalendar/libical/design-data/Makefile.in
++++ claws-mail-3.9.1/src/plugins/vcalendar/libical/design-data/Makefile.in
+@@ -341,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/design-data/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/design-data/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/vcalendar/libical/design-data/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/vcalendar/libical/design-data/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/perl/Makefile.in
++++ claws-mail-3.9.1/src/plugins/perl/Makefile.in
+@@ -453,9 +453,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/perl/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/perl/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/perl/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/perl/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/perl/tools/Makefile.in
++++ claws-mail-3.9.1/src/plugins/perl/tools/Makefile.in
+@@ -341,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/perl/tools/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/perl/tools/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/perl/tools/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/perl/tools/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/fancy/Makefile.in
++++ claws-mail-3.9.1/src/plugins/fancy/Makefile.in
+@@ -439,9 +439,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/fancy/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/fancy/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/fancy/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/fancy/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/tnef_parse/Makefile.in
++++ claws-mail-3.9.1/src/plugins/tnef_parse/Makefile.in
+@@ -449,9 +449,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/tnef_parse/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/tnef_parse/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/tnef_parse/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/tnef_parse/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/spamassassin/Makefile.in
++++ claws-mail-3.9.1/src/plugins/spamassassin/Makefile.in
+@@ -423,9 +423,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/spamassassin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/spamassassin/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/spamassassin/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/spamassassin/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/clamd/Makefile.in
++++ claws-mail-3.9.1/src/plugins/clamd/Makefile.in
+@@ -455,9 +455,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/clamd/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/clamd/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/clamd/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/clamd/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/clamd/libclamd/Makefile.in
++++ claws-mail-3.9.1/src/plugins/clamd/libclamd/Makefile.in
+@@ -378,9 +378,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/clamd/libclamd/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/clamd/libclamd/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/clamd/libclamd/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/clamd/libclamd/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/smime/Makefile.in
++++ claws-mail-3.9.1/src/plugins/smime/Makefile.in
+@@ -452,9 +452,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/smime/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/smime/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/smime/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/smime/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/acpi_notifier/Makefile.in
++++ claws-mail-3.9.1/src/plugins/acpi_notifier/Makefile.in
+@@ -412,9 +412,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/acpi_notifier/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/acpi_notifier/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/acpi_notifier/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/acpi_notifier/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/archive/Makefile.in
++++ claws-mail-3.9.1/src/plugins/archive/Makefile.in
+@@ -426,9 +426,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/archive/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/archive/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/archive/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/archive/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/att_remover/Makefile.in
++++ claws-mail-3.9.1/src/plugins/att_remover/Makefile.in
+@@ -432,9 +432,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/att_remover/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/att_remover/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/att_remover/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/att_remover/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/plugins/address_keeper/Makefile.in
++++ claws-mail-3.9.1/src/plugins/address_keeper/Makefile.in
+@@ -436,9 +436,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/address_keeper/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/address_keeper/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/plugins/address_keeper/Makefile
++	  $(AUTOMAKE) --gnu src/plugins/address_keeper/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/etpan/Makefile.in
++++ claws-mail-3.9.1/src/etpan/Makefile.in
+@@ -423,9 +423,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/etpan/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/etpan/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/etpan/Makefile
++	  $(AUTOMAKE) --gnu src/etpan/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/src/gtk/Makefile.in
++++ claws-mail-3.9.1/src/gtk/Makefile.in
+@@ -496,9 +496,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/gtk/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/gtk/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign src/gtk/Makefile
++	  $(AUTOMAKE) --gnu src/gtk/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/config/Makefile.in
++++ claws-mail-3.9.1/config/Makefile.in
+@@ -336,9 +336,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign config/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign config/Makefile
++	  $(AUTOMAKE) --gnu config/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/doc/Makefile.in
++++ claws-mail-3.9.1/doc/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign doc/Makefile
++	  $(AUTOMAKE) --gnu doc/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/doc/man/Makefile.in
++++ claws-mail-3.9.1/doc/man/Makefile.in
+@@ -369,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/man/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign doc/man/Makefile
++	  $(AUTOMAKE) --gnu doc/man/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/Makefile.in
++++ claws-mail-3.9.1/manual/Makefile.in
+@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/Makefile
++	  $(AUTOMAKE) --gnu manual/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/es/Makefile.in
++++ claws-mail-3.9.1/manual/es/Makefile.in
+@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/es/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/es/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/es/Makefile
++	  $(AUTOMAKE) --gnu manual/es/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/es/dist/Makefile.in
++++ claws-mail-3.9.1/manual/es/dist/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/es/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/es/dist/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/es/dist/Makefile
++	  $(AUTOMAKE) --gnu manual/es/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/es/dist/ps/Makefile.in
++++ claws-mail-3.9.1/manual/es/dist/ps/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/es/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/es/dist/ps/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/es/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu manual/es/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/es/dist/txt/Makefile.in
++++ claws-mail-3.9.1/manual/es/dist/txt/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/es/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/es/dist/txt/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/es/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu manual/es/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/es/dist/pdf/Makefile.in
++++ claws-mail-3.9.1/manual/es/dist/pdf/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/es/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/es/dist/pdf/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/es/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu manual/es/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/es/dist/html/Makefile.in
++++ claws-mail-3.9.1/manual/es/dist/html/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/es/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/es/dist/html/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/es/dist/html/Makefile
++	  $(AUTOMAKE) --gnu manual/es/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/fr/Makefile.in
++++ claws-mail-3.9.1/manual/fr/Makefile.in
+@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/fr/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/fr/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/fr/Makefile
++	  $(AUTOMAKE) --gnu manual/fr/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/fr/dist/Makefile.in
++++ claws-mail-3.9.1/manual/fr/dist/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/fr/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/fr/dist/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/fr/dist/Makefile
++	  $(AUTOMAKE) --gnu manual/fr/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/fr/dist/ps/Makefile.in
++++ claws-mail-3.9.1/manual/fr/dist/ps/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/fr/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/fr/dist/ps/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/fr/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu manual/fr/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/fr/dist/txt/Makefile.in
++++ claws-mail-3.9.1/manual/fr/dist/txt/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/fr/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/fr/dist/txt/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/fr/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu manual/fr/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/fr/dist/pdf/Makefile.in
++++ claws-mail-3.9.1/manual/fr/dist/pdf/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/fr/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/fr/dist/pdf/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/fr/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu manual/fr/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/fr/dist/html/Makefile.in
++++ claws-mail-3.9.1/manual/fr/dist/html/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/fr/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/fr/dist/html/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/fr/dist/html/Makefile
++	  $(AUTOMAKE) --gnu manual/fr/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/pl/Makefile.in
++++ claws-mail-3.9.1/manual/pl/Makefile.in
+@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/pl/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/pl/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/pl/Makefile
++	  $(AUTOMAKE) --gnu manual/pl/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/pl/dist/Makefile.in
++++ claws-mail-3.9.1/manual/pl/dist/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/pl/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/pl/dist/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/pl/dist/Makefile
++	  $(AUTOMAKE) --gnu manual/pl/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/pl/dist/ps/Makefile.in
++++ claws-mail-3.9.1/manual/pl/dist/ps/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/pl/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/pl/dist/ps/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/pl/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu manual/pl/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/pl/dist/txt/Makefile.in
++++ claws-mail-3.9.1/manual/pl/dist/txt/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/pl/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/pl/dist/txt/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/pl/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu manual/pl/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/pl/dist/pdf/Makefile.in
++++ claws-mail-3.9.1/manual/pl/dist/pdf/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/pl/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/pl/dist/pdf/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/pl/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu manual/pl/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/pl/dist/html/Makefile.in
++++ claws-mail-3.9.1/manual/pl/dist/html/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/pl/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/pl/dist/html/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/pl/dist/html/Makefile
++	  $(AUTOMAKE) --gnu manual/pl/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/dist/Makefile.in
++++ claws-mail-3.9.1/manual/dist/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/dist/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/dist/Makefile
++	  $(AUTOMAKE) --gnu manual/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/dist/ps/Makefile.in
++++ claws-mail-3.9.1/manual/dist/ps/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/dist/ps/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu manual/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/dist/txt/Makefile.in
++++ claws-mail-3.9.1/manual/dist/txt/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/dist/txt/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu manual/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/dist/pdf/Makefile.in
++++ claws-mail-3.9.1/manual/dist/pdf/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/dist/pdf/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu manual/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/dist/html/Makefile.in
++++ claws-mail-3.9.1/manual/dist/html/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/dist/html/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/dist/html/Makefile
++	  $(AUTOMAKE) --gnu manual/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/dtd/Makefile.in
++++ claws-mail-3.9.1/manual/dtd/Makefile.in
+@@ -337,9 +337,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/dtd/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/dtd/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/dtd/Makefile
++	  $(AUTOMAKE) --gnu manual/dtd/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/de/Makefile.in
++++ claws-mail-3.9.1/manual/de/Makefile.in
+@@ -390,9 +390,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/de/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/de/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/de/Makefile
++	  $(AUTOMAKE) --gnu manual/de/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/de/dist/Makefile.in
++++ claws-mail-3.9.1/manual/de/dist/Makefile.in
+@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/de/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/de/dist/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/de/dist/Makefile
++	  $(AUTOMAKE) --gnu manual/de/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/de/dist/ps/Makefile.in
++++ claws-mail-3.9.1/manual/de/dist/ps/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/de/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/de/dist/ps/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/de/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu manual/de/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/de/dist/txt/Makefile.in
++++ claws-mail-3.9.1/manual/de/dist/txt/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/de/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/de/dist/txt/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/de/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu manual/de/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/de/dist/pdf/Makefile.in
++++ claws-mail-3.9.1/manual/de/dist/pdf/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/de/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/de/dist/pdf/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/de/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu manual/de/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/manual/de/dist/html/Makefile.in
++++ claws-mail-3.9.1/manual/de/dist/html/Makefile.in
+@@ -367,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign manual/de/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/de/dist/html/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign manual/de/dist/html/Makefile
++	  $(AUTOMAKE) --gnu manual/de/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/m4/Makefile.in
++++ claws-mail-3.9.1/m4/Makefile.in
+@@ -346,9 +346,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign m4/Makefile
++	  $(AUTOMAKE) --gnu m4/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+--- claws-mail-3.9.1.orig/tools/Makefile.in
++++ claws-mail-3.9.1/tools/Makefile.in
+@@ -380,9 +380,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+ 	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign tools/Makefile
++	  $(AUTOMAKE) --gnu tools/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
diff -Nru claws-mail-3.9.1/debian/patches/series claws-mail-3.9.1/debian/patches/series
--- claws-mail-3.9.1/debian/patches/series	2013-05-07 23:19:39.000000000 +0000
+++ claws-mail-3.9.1/debian/patches/series	2013-06-15 00:08:58.000000000 +0000
@@ -1,2 +1,3 @@
 11mark_trashed_as_read.patch
 12fix_manpage_header.patch
+fix-multiarch-python.patch