diff --git a/diffutils-3.5.15.tar.xz b/diffutils-3.5.15.tar.xz
deleted file mode 100644
index c7e0aca..0000000
--- a/diffutils-3.5.15.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44b97b2907e3b8ab1e7dcaf860c8d0564773a42722604a1fab6158ce573e860d
-size 1378468
diff --git a/diffutils-3.6.tar.xz b/diffutils-3.6.tar.xz
new file mode 100644
index 0000000..c86513a
--- /dev/null
+++ b/diffutils-3.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6
+size 1398296
diff --git a/diffutils-3.6.tar.xz.sig b/diffutils-3.6.tar.xz.sig
new file mode 100644
index 0000000..85823cc
--- /dev/null
+++ b/diffutils-3.6.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJZIfmkAAoJEH/Z/MsAC+7uqLUP/0tj7JXPEO6WN2y76ssw23r5
+mrGy3rF8qiy1F8QoM4VymTRMFAdKFjq4oPd0iW5HicYnD8Mb8Vt0v6+TGXa4ysOz
+0gkr3qdnRLcRLVEXs2jnTSRyVPUnOPrECQkOgJPseTQI28TbccxCNC8LBwLAsb4H
+EKATndnfUPFxy1gntrRIc4O7e6IyjUYfikrzGgPLil4GFTQZMiJ5FJuFkCBoW6+C
+hNAWVOLuT/3mCm3AIzLSK7SbUMa2xa6hQ29d7VAtEP/dH3HRDzFEmsw9CVdo8iDE
+DVc1vetlUfs+2WoXSuDee7enTBhXJLyV2P1TxxpRU1nX24sLeqWPz8L548BguRnO
+yArz5AhZ3ep9nSaSfd+7iKmzxQK4+eO2a5a1OguDzHNDjV1tvqr61A9o7wBWljJU
+Wb/aEGkyn3pqQCbA+Ia3SJoXLbIC8i9ASJ1/XaADRplMuq6BOz7ivgNBkP2Opxvh
+lISoLbwrR+FJHyJusx2KIHbJsoei6IWj57EaR993ZylTLNnWk5oBAU5X3h4cIVec
+mTMxJ0j1lojXEtQBskQ3q8Q8ZXwLWBhDYz2smBQasnvaibNJmsx/WYNTFo5v8jIE
+YyvjkQ2SYULnmC/Evzz+nX1EW7hXFLilXeU73mcHlUKl59qwEZ9QCMd4I3i795Wh
+udOMJR+url+hCgi3Wifv
+=IN0s
+-----END PGP SIGNATURE-----
diff --git a/diffutils.changes b/diffutils.changes
index 67022de..c8cfd0d 100644
--- a/diffutils.changes
+++ b/diffutils.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May 22 13:06:57 UTC 2017 - mpluskal@suse.com
+
+- Update to version 3.6:
+  * When one file is a prefix of the other, cmp now appends the
+    shorter file's size to the EOF diagnostic.
+  * diff's default algorithm has been tweaked to deal better with
+    larger files, reversing some of the changes made in
+    diffutils-3.4.
+- Define packager and bug reporting url
+
 -------------------------------------------------------------------
 Wed Feb 22 09:51:50 UTC 2017 - mliska@suse.cz
 
diff --git a/diffutils.keyring b/diffutils.keyring
index fbe58db..4ed8d7f 100644
Binary files a/diffutils.keyring and b/diffutils.keyring differ
diff --git a/diffutils.spec b/diffutils.spec
index faa7363..4f419d0 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -17,16 +17,14 @@
 
 
 Name:           diffutils
-Version:        3.5.15
+Version:        3.6
 Release:        0
 Summary:        GNU diff Utilities
 License:        GFDL-1.2 and GPL-3.0+
 Group:          Productivity/Text/Utilities
 Url:            https://www.gnu.org/software/diffutils/
-Source0:        %{name}-%{version}.tar.xz
-#Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
-# Source1:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
-# http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=diffutils
+Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+Source1:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 BuildRequires:  xz
 Requires(pre):  %{install_info_prereq}
@@ -34,7 +32,6 @@ Requires(preun): %{install_info_prereq}
 Recommends:     %{name}-lang = %{version}
 Provides:       diff = %{version}
 Obsoletes:      diff < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The GNU diff utilities find differences between files. diff is used to
@@ -48,7 +45,9 @@ make source code patches, for instance.
 %build
 export CFLAGS="%{optflags} -fPIE"
 export LDFLAGS="-pie"
-%configure
+%configure \
+  --with-packager="openSUSE" \
+  --with-packager-bug-reports="http://bugs.opensuse.org/"
 make %{?_smp_mflags} V=1
 
 %check