diff --git a/msmtp-1.4.32.tar.bz2 b/msmtp-1.4.32.tar.bz2
deleted file mode 100644
index 51a09d9..0000000
--- a/msmtp-1.4.32.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88
-size 303652
diff --git a/msmtp-1.6.1.tar.xz b/msmtp-1.6.1.tar.xz
new file mode 100644
index 0000000..1ea2fdf
--- /dev/null
+++ b/msmtp-1.6.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c45d47f2dc77484e3f74c0f66aef0d5d95de6c47ed71d9f926d86d546f8346f3
+size 279324
diff --git a/msmtp.changes b/msmtp.changes
index 3439629..a71c620 100644
--- a/msmtp.changes
+++ b/msmtp.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Jan  5 19:11:11 UTC 2015 - benoit.monin@gmx.fr
+
+- update to version 1.6.1:
+  * The new configure option --with-tls replaces --with-ssl.
+  * A new configure option --disable-gai-idn was added.
+- additional changes from 1.6.0:
+  * Support for SOCKS proxies was added. This allows msmtp to be
+    used with Tor.
+  * GNOME Keyring support now uses libsecret instead of
+    libgnome-keyring. It is now documented how to use secret-tool
+    to manage passwords for msmtp; the obsolete msmtp-gnome-tool
+    script is removed.
+  * Configuration file security is now only checked if the file
+    actually contains secrets such as passwords.
+  * The GSSAPI authentication method is not chosen automatically
+    anymore, you have to request it manually if you really want to
+    use it.
+  * From: and Date: headers are now added to mails if necessary, for
+    compatibility with sendmail, postfix, exim, and other MTAs. This
+    can be disabled with the add_missing_from_header and
+    add_missing_date_header commands.
+  * Libidn is not required for IDN support anymore on systems where
+    getaddrinfo() supports the AI_IDN flag and the GnuTLS version
+    is >= 3.4.0.
+  * The new remove_bcc_headers command replaces the old keepbcc
+    command (but the old command is still supported for
+    compatibility).
+  * SSLv3 is disabled, and the obsolete tls_force_sslv3 command and
+    --tls-force-sslv3 option have no effect anymore.
+- add xz as BuildRequires: source archive format is now tar.xz
+- switch gnome keyring support to libsecret
+- remove msmtp-gnome-tool.py: deleted upstream
+- remove README.msmtp-gnome-tool: deleted upstream
+- remove Mutt+msmtp.txt: deleted upstream
+
 -------------------------------------------------------------------
 Tue Jul 29 19:14:32 UTC 2014 - benoit.monin@gmx.fr
 
diff --git a/msmtp.spec b/msmtp.spec
index 89e234b..2078c48 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package msmtp
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,14 @@
 %bcond_with gnome_keyring
 
 Name:           msmtp
-Version:        1.4.32
+Version:        1.6.1
 Release:        0
 BuildRequires:  libidn-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pkg-config
+BuildRequires:  xz
 %if %{with gnome_keyring}
-BuildRequires:  pkgconfig(gnome-keyring-1)
+BuildRequires:  pkgconfig(libsecret-1)
 %endif
 %if 0%{?suse_version} >= 1120
 BuildRequires:  libgsasl-devel
@@ -57,7 +58,7 @@ Summary:        Lightweight SMTP Client
 License:        GPL-3.0+
 Group:          Productivity/Networking/Email/Utilities
 Url:            http://msmtp.sourceforge.net/
-Source:         http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.bz2
+Source:         http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -112,13 +113,11 @@ for i in README ChangeLog ; do
 done
 cp scripts/msmtpq/README.msmtpq    README.msmtpq
 cp scripts/vim/README              README.vim
-cp scripts/msmtp-gnome-tool/README README.msmtp-gnome-tool
 
 install -m 0755 \
         scripts/msmtpqueue/*.sh \
         scripts/msmtpq/msmtpq \
         scripts/msmtpq/msmtp-queue \
-        scripts/msmtp-gnome-tool/msmtp-gnome-tool.py \
         scripts/set_sendmail/*.sh \
         scripts/find_alias/*.sh \
     %{buildroot}%{_bindir}
@@ -143,8 +142,7 @@ done
 echo -n >docfiles.lst
 for f in \
 AUTHORS ChangeLog* NEWS README README.msmtpqueue README.msmtpq THANKS \
-README.msmtp-gnome-tool \
-doc/Mutt+msmtp.txt doc/*.example \
+doc/*.example \
 scripts/set_sendmail/set_sendmail.conf \
 ; do
     ff="${f##*/}"
@@ -189,7 +187,6 @@ rm -f "%{buildroot}%{_infodir}/dir"
 %{_bindir}/msmtp-listqueue.sh
 %{_bindir}/set_sendmail.sh
 %{_bindir}/find_alias_for_msmtp.sh
-%{_bindir}/msmtp-gnome-tool.py
 %{_mandir}/man1/msmtp.1%{ext_man}
 %{_infodir}/msmtp.info%{ext_info}
 %{_datadir}/vim/*/syntax/msmtp.vim