diff --git a/_service b/_service
new file mode 100644
index 0000000..8468680
--- /dev/null
+++ b/_service
@@ -0,0 +1,16 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+   <param name="version">1.8.5</param>
+   <param name="url">https://invent.kde.org/sdk/kdiff3</param>
+   <param name="revision">refs/tags/1.8.5</param>
+   <param name="scm">git</param>
+   <param name="filename">kdiff3</param>
+   <!-- This folder will be dropped in the next release -->
+   <param name="exclude">windows_installer</param>
+  </service>
+  <service name="recompress" mode="disabled">
+   <param name="file">*.tar</param>
+   <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled" />
+</services>
diff --git a/kdiff3-1.8.4.tar.xz b/kdiff3-1.8.4.tar.xz
deleted file mode 100644
index 1ded24e..0000000
--- a/kdiff3-1.8.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76e18e097a078c1a440a32562734391d71d12446fcd3b2afeece87c136f43bb8
-size 1040492
diff --git a/kdiff3-1.8.5.tar.xz b/kdiff3-1.8.5.tar.xz
new file mode 100644
index 0000000..eaa0a90
--- /dev/null
+++ b/kdiff3-1.8.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:858387c68e022a724c5fb2415579f3d05dba749a286197de0f9790e9ed2144a8
+size 424356
diff --git a/kdiff3-lang.tar.xz b/kdiff3-lang.tar.xz
new file mode 100644
index 0000000..0b0d95e
--- /dev/null
+++ b/kdiff3-lang.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d38ce966e2658ede79fd6e69b10f107693883ac3ca25063fa9d45f8a0e09d47
+size 626552
diff --git a/kdiff3.changes b/kdiff3.changes
index 2dafeb6..c9c4625 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Mar  5 09:03:31 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Use a _service file to exclude the windows_installer folder.
+
+-------------------------------------------------------------------
+Fri Jan 22 06:40:24 UTC 2021 - wbauer@tmo.at
+
+- Update to 1.8.5:
+  * Fix url handling for drag and drop (kde#417189)
+  * Fix regression in handling paste from clipboard to blank diff
+    window (kde#426823)
+  * Fix link detection via KIO
+  * Drop custom event filter in OpenDialog. We now use
+    FileNameLineEdit instead as in the main window.
+  * Fix url/path handling bugs for remote files
+  * Don't ignore stat errors unless it tells us the file was not
+    found
+
 -------------------------------------------------------------------
 Thu Sep  3 11:53:51 UTC 2020 - wbauer@tmo.at
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 1ae5d5f..eb73770 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kdiff3
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,16 @@
 
 %bcond_without lang
 Name:           kdiff3
-Version:        1.8.4
+Version:        1.8.5
 Release:        0
 Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Version Control
 URL:            http://kdiff3.sourceforge.net/
-Source0:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
+# Drop the _service file and restore the line below for the next release
+# Source0:        https://download.kde.org/stable/%%{name}/%%{name}-%%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.xz
+Source1:        kdiff3-lang.tar.xz
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
@@ -58,7 +61,7 @@ KDiff3 is a program that:
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1 -a1
 
 %build
   %cmake_kf5 -d build