diff --git a/neon-0.30.2-sysuioh.patch b/neon-0.30.2-sysuioh.patch
new file mode 100644
index 0000000..3501da9
--- /dev/null
+++ b/neon-0.30.2-sysuioh.patch
@@ -0,0 +1,14 @@
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1572180
+
+--- neon-0.30.2/src/ne_socket.c.sysuioh
++++ neon-0.30.2/src/ne_socket.c
+@@ -27,7 +27,7 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
+-#ifdef HAVE_SYS_UIO_h
++#ifdef HAVE_SYS_UIO_H
+ #include <sys/uio.h> /* writev(2) */
+ #endif
+ #ifdef HAVE_SYS_TIME_H
diff --git a/neon.spec b/neon.spec
index 24c9272..7460dd3 100644
--- a/neon.spec
+++ b/neon.spec
@@ -1,15 +1,22 @@
+%bcond_without tests
+
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.30.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
+Patch1: neon-0.30.2-sysuioh.patch
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
 BuildRequires: pkgconfig, pakchois-devel
 Requires: ca-certificates
+%if %{with tests}
+# SSL tests require openssl binary, PKCS#11 testing need certutil
+BuildRequires: %{_bindir}/perl, %{_bindir}/openssl, %{_bindir}/certutil
+%endif
 
 %description
 neon is an HTTP and WebDAV client library, with a C interface;
@@ -32,6 +39,7 @@ The development library for the C language HTTP and WebDAV client library.
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .sysuioh
 
 # prevent installation of HTML docs
 sed -ibak '/^install-docs/s/install-html//' Makefile.in
@@ -53,9 +61,12 @@ sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
 
 %find_lang %{name}
 
-%post -p /sbin/ldconfig
+%if %{with tests}
+%check
+make %{?_smp_mflags} check
+%endif
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -73,6 +84,11 @@ sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
 %{_libdir}/*.so
 
 %changelog
+* Thu Jun 28 2018 Joe Orton <jorton@redhat.com> - 0.30.2-6
+- fix implicit writev declaration (Mattias Ellert, #1572180)
+- add build conditional for tests
+- use ldconfig_scriptlets macro
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild