diff --git a/autogen.sh b/autogen.sh
index eee074b5d..34a009698 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@
   fi
   echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4
 
-  AM_ARGS="--add-missing --gnu --copy"
+  AM_ARGS="--add-missing --gnu --copy -Wno-portability"
   CONF_ARGS=""
   if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then
     . /Library/Frameworks/GTK+.framework/Versions/Current/env
@@ -36,6 +36,6 @@
   && aclocal -I ./m4 \
   && $LIBTOOLIZE --copy --force --automake \
   && autoheader \
-  && autoconf  \
+  && autoconf \
   && automake ${AM_ARGS} \
   && ./configure ${CONF_ARGS} $@
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 36e963985..8ae9bce2c 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,7 +2,14 @@ INCLUDES = \
 	$(PYTHON_INCLUDES)
 
 gajimpluginsdir = $(gajim_pluginsdir)
-nobase_dist_gajimplugins_PYTHON = \
+
+installedplugins = acronyms_expander banner_tweaks ftp_manager length_notifier whiteboard
+
+installedpluginsfiles = $(wildcard ${srcdir}/${p}/*.py ${srcdir}/${p}/manifest.ini ${srcdir}/${p}/*.ui ${srcdir}/${p}/*.png)
+
+nobase_dist_gajimplugins_PYTHON = $(foreach p, ${installedplugins}, $(installedpluginsfiles))
+
+EXTRA_DIST = \
 	$(srcdir)/*/*.py \
 	$(srcdir)/*/manifest.ini \
 	$(srcdir)/*/*.ui