diff --git a/dnscrypt b/dnscrypt
index c87a4ec..827735e 100644
--- a/dnscrypt
+++ b/dnscrypt
@@ -10,6 +10,7 @@ fi
 	${DNSCRYPT_LOCAL_ADDRESS:+--local-address "$DNSCRYPT_LOCAL_ADDRESS"} \
 	${DNSCRYPT_USER:+--user "$DNSCRYPT_USER"}		\
 	--resolver-name "${DNSCRYPT_RESOLVER_NAME:-opendns}"	\
+	${DNSCRYPT_EPHEMERAL_KEYS:+--ephemeral-keys}		\
 	${DNSCRYPT_LOGFILE:+--logfile "$DNSCRYPT_LOGFILE"}	\
 	${DNSCRYPT_PLUGIN1:+--plugin "$DNSCRYPT_PLUGIN1"}	\
 	${DNSCRYPT_PLUGIN2:+--plugin "$DNSCRYPT_PLUGIN2"}	\
diff --git a/dnscrypt-proxy-1.4.3.tar.bz2 b/dnscrypt-proxy-1.4.3.tar.bz2
deleted file mode 100644
index d68df64..0000000
--- a/dnscrypt-proxy-1.4.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b645813dfa4247e9acd1d14df78f8b12df3b0132c1d6d6abd33daee33403232
-size 1256110
diff --git a/dnscrypt-proxy-1.6.0.tar.bz2 b/dnscrypt-proxy-1.6.0.tar.bz2
new file mode 100644
index 0000000..fbfae0e
--- /dev/null
+++ b/dnscrypt-proxy-1.6.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0cce91dc6ab4ed76478579a899b2abb888b1d7ed133cb55294c2f9ce24edc7d
+size 1265461
diff --git a/dnscrypt-proxy.changes b/dnscrypt-proxy.changes
index ab13a7e..556eb56 100644
--- a/dnscrypt-proxy.changes
+++ b/dnscrypt-proxy.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Sep 1 00:00:00 CEST 2015 - dsterba@suse.cz
+
+* version 1.6.0:
+ - New feature: public-key based client authentication (-K), for private and
+   commercial DNS services to securely authenticate the sender of a query no
+   matter what the source IP address is, without altering the DNS query.
+* version 1.5.0:
+ - New option: -E, to use an ephemeral key pair for each query.
+ - Logging to files is supported on Windows.
+ - TCP FASTOPEN is now enabled on Linux.
+* version 1.4.4
+  - edns used by default
+  - server list updated
+  - various build fixes
+- spec file cleanup
+
 -------------------------------------------------------------------
 Fri Mar 6 00:00:00 CET 2015 - dsterba@suse.cz
 
diff --git a/dnscrypt-proxy.spec b/dnscrypt-proxy.spec
index dc2db86..5c258f0 100644
--- a/dnscrypt-proxy.spec
+++ b/dnscrypt-proxy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dnscrypt-proxy
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           dnscrypt-proxy
-Version:        1.4.3
+Version:        1.6.0
 Release:        0
 Summary:        A tool for securing communications between a client and a DNS resolver
 License:        BSD-3-Clause
@@ -28,18 +28,18 @@ Source:         http://download.dnscrypt.org/dnscrypt-proxy/%{name}-%{version}.t
 Source1:        %{name}.service
 Source2:        dnscrypt
 Source3:        sysconfig.dnscrypt
-BuildRequires:  libsodium-devel
-BuildRequires:  shadow
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  libsodium-devel
 BuildRequires:  libtool
+BuildRequires:  shadow
+Provides:       dnscrypt = %{version}-%{release}
+Obsoletes:      dnscrypt < %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %{?systemd_requires}
 %endif
-Provides:	dnscrypt = %{version}-%{release}
-Obsoletes:	dnscrypt < %{version}-%{release}
 
 %description
 dnscrypt-proxy provides local service which can be used directly as your local resolver or as a DNS forwarder,
@@ -71,11 +71,11 @@ make %{?_smp_mflags}
 %make_install
 
 install -d -m 755 %{buildroot}%{_unitdir}
-install -m 644 %{S:1} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
 install -d -m 755 %{buildroot}%{_sbindir}
-install -m 755 %{S:2} %{buildroot}%{_sbindir}
+install -m 755 %{SOURCE2} %{buildroot}%{_sbindir}
 install -m 755 -d %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 -D %{S:3} %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 -D %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
 ln -s %{_mandir}/man8/%{name}.8.gz %{buildroot}%{_mandir}/man8/dnscrypt.8.gz
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdnscrypt
@@ -117,7 +117,6 @@ fi
 %{_sbindir}/%{name}
 %{_sbindir}/rc%{name}
 %{_sbindir}/rcdnscrypt
-%{_sbindir}/%{name}
 %{_unitdir}/%{name}.service
 %{_mandir}/man8/hostip.8.gz
 %{_mandir}/man8/%{name}.8.gz
@@ -125,11 +124,12 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dnscrypt-resolvers.csv
 %{_localstatedir}/adm/fillup-templates/sysconfig.dnscrypt
+%{_datadir}/dnscrypt-proxy/minisign.pub
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/dnscrypt/
-/usr/include/dnscrypt/*
+%dir %{_includedir}/dnscrypt/
+%{_includedir}/dnscrypt/*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
 
diff --git a/sysconfig.dnscrypt b/sysconfig.dnscrypt
index 794ec6d..8ffd6c9 100644
--- a/sysconfig.dnscrypt
+++ b/sysconfig.dnscrypt
@@ -96,3 +96,12 @@ DNSCRYPT_PLUGIN4=
 # Additional user options
 #
 DNSCRYPT_OPTIONS=
+
+## Path:        Network/DNS/DNSCrypt
+## Description: Use ephemeral keys
+## Type:        string
+## Default:     "yes"
+#
+# Enable ephemeral keys for connections.
+#
+DNSCRYPT_EPHEMERAL_KEYS=