diff --git a/msmtp-1.4.19.tar.bz2 b/msmtp-1.4.19.tar.bz2
deleted file mode 100644
index b63571c..0000000
--- a/msmtp-1.4.19.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6bf3f6f796041fc7d6653c022cc696238fdf8b2d538c4b2cd6c0aae5f056c66
-size 820041
diff --git a/msmtp-1.4.20.tar.bz2 b/msmtp-1.4.20.tar.bz2
new file mode 100644
index 0000000..df52acb
--- /dev/null
+++ b/msmtp-1.4.20.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:328abd95370c6a5a9ea2fd38b55fc50d6fb3b03d96b3da40de2441650d53ebdb
+size 845014
diff --git a/msmtp.changes b/msmtp.changes
index 1855867..5db8e7c 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Mar 21 11:03:36 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to version 1.4.20
+  - adds support for the authentication mechanism SCRAM-SHA-1 via
+    GNU SASL (only on openSUSE >= 11.2)
+  - the new command tls_fingerprint allows one to trust one
+    particular TLS certificate, in case tls_trust_file cannot be
+    used for some reason
+  - the new script msmtp-gnome-tool.py manages Gnome Keyring
+    passwords for msmtp (currently disabled in this build)
+
+- moved documentation files to a -doc subpackage
+
 -------------------------------------------------------------------
 Fri Nov 20 15:28:11 UTC 2009 - mrueckert@suse.de
 
diff --git a/msmtp.spec b/msmtp.spec
index f30533b..7c83263 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package msmtp (Version 1.4.19)
+# spec file for package msmtp (Version 1.4.20)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           msmtp
-Version:        1.4.19
+Version:        1.4.20
 Release:        1
 #
 License:        GPLv3+
@@ -27,16 +27,36 @@ Group:          Productivity/Networking/Email/Utilities
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libidn-devel openssl-devel
+%if 0%{?suse_version} >= 1120
+BuildRequires:  libgsasl-devel
+%endif
 # for the directory
+%if 0%{?centos_version}
+BuildRequires:  vim-common
+Requires:       vim-common
+%else
+%if 0%{?suse_version} < 1030
+# old openSUSE and SLES and Fedora and RHEL:
+BuildRequires:  vim
+Requires:       vim
+%else
+# recent openSUSE:
+BuildRequires:  vim-base
 Requires:       vim-base
+%endif #suse_version
+%endif #centos_version
 %if 0%{?suse_version}
 PreReq:         %install_info_prereq
 %endif
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+Requires(post): /sbin/install-info
+Requires(preun):/sbin/install-info
+%endif
 #
 Url:            http://msmtp.sourceforge.net/
 Source:         http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.bz2
 #
-Summary:        An SMTP Client
+Summary:        Lightweight SMTP Client
 
 %description
 msmtp is an SMTP client that can be used as a plug-in for Mutt and
@@ -45,10 +65,25 @@ the delivery.  msmtp supports multiple accounts.
 
 
 
+
 Authors:
 --------
     Martin Lambers <marlam@marlam.de>
 
+%package doc
+License:        GPLv3+
+Summary:        Documentation for %{name}
+Group:          Documentation/Other
+Requires:       %{name} = %{version}
+
+%description doc
+msmtp is an SMTP client that can be used as a plug-in for Mutt and
+other mail user agents.  It forwards mail to an SMTP server that does
+the delivery.  msmtp supports multiple accounts.
+
+This subpackage contains the documentation for %{name}, including
+examples and sample configuration files.
+
 %prep
 %setup -q
 
@@ -56,8 +91,8 @@ Authors:
 %if 0%{?suse_version} > 1000
 export CFLAGS="%{optflags} -fstack-protector"
 %endif
-%configure --docdir=%{_docdir}/%{name} --with-ssl=openssl
-%{__make}
+%configure --docdir="%{_docdir}/%{name}" --with-ssl=openssl
+%__make %{?jobs:-j%{jobs}}
 
 %install
 %makeinstall
@@ -77,22 +112,52 @@ done
       scripts/vim/msmtp.vim \
       %{buildroot}%{_datadir}/vim/current/syntax/msmtp.vim
 
+# main package doc files
+for f in \
+COPYING\
+; do
+    %__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$f"
+done
+
+# doc files
+echo -n >docfiles.lst
+for f in \
+AUTHORS ChangeLog* NEWS README README.msmtpqueue README.msmtpq THANKS \
+doc/msmtp.html doc/Mutt+msmtp.txt doc/*.example \
+scripts/set_sendmail/set_sendmail.conf \
+; do
+    ff="${f##*/}"
+    %__install -D -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/$ff"
+    echo "%doc %{_docdir}/%{name}/$ff" >>docfiles.lst
+done
+
+# not properly ignored on Fedora 10:
+%__rm -f "%{buildroot}%{_infodir}/dir"
+
 %clean
 %{__rm} -rf %{buildroot}
+
 %if 0%{?suse_version}
 
 %post
-%install_info --info-dir=%{_infodir} %{_infodir}/msmtp.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/msmtp.info%{ext_info}
 
 %postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/msmtp.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/msmtp.info%{ext_info}
 %endif
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+
+%post
+[ "$1" = "1" ] && /sbin/install-info "%{_infodir}/%{name}.info%{ext_info}" || :
+
+%preun
+[ "$1" = "0" ] && /sbin/install-info --delete "%{_infodir}/%{name}.info%{ext_info}" || :
+%endif # fedora
 
 %files -f %{name}.lang
 %defattr (-, root, root)
-%doc AUTHORS ChangeLog* COPYING NEWS README README.msmtpqueue README.msmtpq THANKS
-%doc doc/msmtp.html doc/Mutt+msmtp.txt doc/*.example
-%doc scripts/set_sendmail/set_sendmail.conf
+%doc %dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/COPYING
 %{_bindir}/msmtp
 %{_bindir}/msmtpq
 %{_bindir}/msmtpQ
@@ -101,8 +166,12 @@ done
 %{_bindir}/msmtp-listqueue.sh
 %{_bindir}/set_sendmail.sh
 %{_bindir}/find_alias_for_msmtp.sh
-%{_mandir}/man1/msmtp.1*
-%{_infodir}/msmtp.info*
+%{_mandir}/man1/msmtp.1%{ext_man}
+%{_infodir}/msmtp.info%{ext_info}
 %{_datadir}/vim/current/syntax/msmtp.vim
 
+%files doc -f docfiles.lst
+%defattr (-, root, root)
+%doc %dir %{_docdir}/%{name}
+
 %changelog