diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 97cde2e08..7090ff480 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168547 2012-10-13 11:00:14Z andyrtr $
+# $Id$
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed valgrind from makedepends
 
 pkgname=claws-mail
-pkgver=3.9.0
+pkgver=3.9.1
 pkgrel=1
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
@@ -13,34 +13,52 @@ license=('GPL3')
 url="http://www.claws-mail.org"
 depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant'
          'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter')
-optdepends=('python2:           needed for some tools'
-            'perl:              needed for some tools'
+makedepends=('compface' 'spamassassin' 'bogofilter'
+             # dependencies for plugins
+             'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
+             #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+optdepends=('python2:           needed for some tools and python plugin'
+            'perl:              needed for some tools and perl plugin'
             'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering')
-replaces=('sylpheed-claws')
+            'bogofilter:        adds support for spamfiltering'
+            'libnotify:         for notification plugin'
+            'libcanberra:       for notification plugin'
+            'dbus-core:         for notification plugin'
+            'libxml2:           for gtkhtml2_viewer and rssyl plugins'
+            'curl:              for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive:        for archive plugin and various other plugins'
+            'libytnef:          for tnef_parse plugin'
+            'webkitgtk2:        for the fancy webkit html plugin'
+            'libsoup:           for the fancy webkit html plugin'
+	        'libgdata:          for gdata plugin'
+	        'poppler-glib:      for pdf viewer plugin'
+	        'ghostscript:       for pdf viewer plugin')    
+replaces=('sylpheed-claws' 'claws-mail-extra-plugins')
+conflicts=('claws-mail-extra-plugins')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
 source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4c5ac7b21f0ed17d0f6404124c2229a4')
+md5sums=('8adc734912ff1b83545cb12850100473')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # fixes for python2
+  export PYTHON="/usr/bin/python2"
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-
+  sed -i 's:python -c:python2 -c:g' configure
+  
   ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \
     --enable-ldap \
-    --disable-dillo-viewer-plugin \
     --enable-crash-dialog \
     --enable-pgpmime-plugin \
     --enable-spamassassin-plugin \
     --enable-bogofilter-plugin \
-    --enable-jpilot
-
+    --enable-jpilot \
+    #--help
   make
 }
 
diff --git a/extra/claws-mail/claws-mail.install b/extra/claws-mail/claws-mail.install
index a6ae1eae6..4d2f155d4 100644
--- a/extra/claws-mail/claws-mail.install
+++ b/extra/claws-mail/claws-mail.install
@@ -1,5 +1,5 @@
 post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails together with html plugins"
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }