diff --git a/subversion.changes b/subversion.changes
index 0753292..2e0e5c5 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct  9 10:30:38 UTC 2017 - vcizek@suse.com
+
+- Disable kwallet support on openSUSE built with openssl 1.1, because
+  otherwise the libopenssl pulled in by libserf and libqt4 create
+  a conflict (boo#1042629)
+
 -------------------------------------------------------------------
 Fri Aug 25 12:41:19 UTC 2017 - tchvatal@suse.com
 
diff --git a/subversion.spec b/subversion.spec
index 115a531..25398af 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -27,7 +27,13 @@
 %if 0%{?is_opensuse} != 1
 %define with_kde 0
 %else
-%define with_kde 1
+  # Disable kwallet support on Tumbleweed, because otherwise there will be
+  # a conflict between libopenssl-devel versions pulled in by libserf and libqt4
+  %if 0%{?suse_version} >= 1330
+  %define with_kde 0
+  %else
+  %define with_kde 1
+  %endif
 %endif
 %bcond_without	python_ctypes
 %bcond_with	all_regression_tests