diff --git a/fix_timeout_tests_for_ppc64le.patch b/fix_timeout_tests_for_ppc64le.patch
new file mode 100644
index 0000000..29a8f46
--- /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 > 10);
+     ONN("close failed", ne_sock_close(sock));
+     return OK;
+ }
diff --git a/neon.changes b/neon.changes
index 0f86f0c..b4028d8 100644
--- a/neon.changes
+++ b/neon.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Mar 20 08:41:59 UTC 2018 - adam.majer@suse.de
+
+- Install license
+- replace_manpage_with_links.sh: replace named links with symlinks
+  and stop using fdupes as it just linked linked manpages
+
+-------------------------------------------------------------------
+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..9bbfaf7 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,16 +20,17 @@ 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
 Source1:        http://www.webdav.org/neon/neon-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
+Source10:       replace_manpage_with_links.sh
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         %{name}-0.28.4-bloat.patch
-BuildRequires:  fdupes
+Patch1:         fix_timeout_tests_for_ppc64le.patch
 BuildRequires:  krb5-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libopenssl-devel
@@ -68,6 +69,9 @@ neon is an HTTP and WebDAV client library with a C interface.
 %prep
 %setup -q
 %patch0
+%ifarch ppc64le ppc64
+%patch1
+%endif
 
 %build
 rm -f aclocal.m4 ltmain.sh
@@ -87,7 +91,7 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} docdir=%{_defaultdocdir}/%{name} install install-man install-html %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
-%fdupes -s %{buildroot}
+find %{buildroot}%{_mandir} -type f -exec bash %{S:10} {} \;
 
 %check
 make %{?_smp_mflags} check
@@ -98,6 +102,7 @@ make %{?_smp_mflags} check
 %files -n libneon27
 %doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 %{_libdir}/*.so.27*
+%license src/COPYING.LIB
 
 %files -n libneon-devel
 %doc %{_defaultdocdir}/%{name}
diff --git a/replace_manpage_with_links.sh b/replace_manpage_with_links.sh
new file mode 100644
index 0000000..3d496cb
--- /dev/null
+++ b/replace_manpage_with_links.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Is this just a linked manpage?
+echo "Processing $1"
+grep '^\.so man\([0-7]\?\)/.*\1$' "$1" || exit 0
+
+# extract target name
+TARGET=`sed -e 's/^\.so man\([0-7]\?\)\///' "$1"`
+MANDIR=`dirname "$1"`
+
+# verify that target exists
+[ -e "$MANDIR"/"$TARGET" ] || exit 1
+
+# replace manpage reload with symlink
+echo "    -> $TARGET"
+rm "$1"
+ln -s $TARGET "$1"
+