diff --git a/fix_timeout_tests_for_ppc64le.patch b/fix_timeout_tests_for_ppc64le.patch
new file mode 100644
index 0000000..a371802
--- /dev/null
+++ b/fix_timeout_tests_for_ppc64le.patch
@@ -0,0 +1,11 @@
+--- test/socket.c.orig	2018-03-19 14:39:27.095824143 +0100
++++ test/socket.c	2018-03-19 15:14:52.733528116 +0100
+@@ -835,7 +835,7 @@
+ {
+     to_finish = time(NULL);
+     reap_server(); /* hopefully it's hung. */
+-    ONN("timeout ignored, or very slow machine", to_finish - to_start > 3);
++    ONN("timeout ignored, or very slow machine", to_finish - to_start > 6);
+     ONN("close failed", ne_sock_close(sock));
+     return OK;
+ }
diff --git a/neon.changes b/neon.changes
index 0f86f0c..c4adeb9 100644
--- a/neon.changes
+++ b/neon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 19 13:46:17 UTC 2018 - marco.strigl@suse.com
+
+- fixed flaky timeout tests for ppc64le (bsc#1085850)
+    * fix_timeout_tests_for_ppc64le.patch
+
 -------------------------------------------------------------------
 Wed Aug 23 14:30:00 UTC 2017 - vcizek@suse.com
 
diff --git a/neon.spec b/neon.spec
index 693a90f..56856b5 100644
--- a/neon.spec
+++ b/neon.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package neon
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -20,7 +20,7 @@ Name:           neon
 Version:        0.30.2
 Release:        0
 Summary:        An HTTP and WebDAV Client Library
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/Other
 Url:            http://www.webdav.org/neon
 Source0:        http://www.webdav.org/neon/neon-%{version}.tar.gz
@@ -29,6 +29,7 @@ Source2:        %{name}.keyring
 Source3:        baselibs.conf
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         %{name}-0.28.4-bloat.patch
+Patch1:         fix_timeout_tests_for_ppc64le.patch
 BuildRequires:  fdupes
 BuildRequires:  krb5-devel
 BuildRequires:  libexpat-devel
@@ -68,6 +69,9 @@ neon is an HTTP and WebDAV client library with a C interface.
 %prep
 %setup -q
 %patch0
+%ifarch ppc64le
+%patch1
+%endif
 
 %build
 rm -f aclocal.m4 ltmain.sh