diff --git a/nbdkit.spec b/nbdkit.spec
index b34f268..efdc03d 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -1,6 +1,11 @@
 %global _hardened_build 1
 
-%ifarch aarch64 %{arm} x86_64 ppc %{power64}
+# Broken on {power64} because of
+# https://bugzilla.redhat.com/show_bug.cgi?id=1778520
+# Broken on {arm} because of
+# https://bugzilla.redhat.com/1795585
+# (but only on F30 / 5.4.x stable branch).
+%ifarch aarch64 x86_64 ppc
 %global have_libguestfs 1
 %endif
 
@@ -9,8 +14,7 @@
 # On all other architectures, a simpler test suite must pass.  This
 # omits any tests that run full qemu, since running qemu under TCG is
 # often broken on non-x86_64 arches.
-# x86_64 is currently broken in F31 by https://bugzilla.redhat.com/1692047
-%global complete_test_arches NONE
+%global complete_test_arches x86_64
 
 # Disable libvirt on riscv64 for now.
 %ifnarch riscv64
@@ -27,7 +31,7 @@
 %global source_directory 1.16-stable
 
 Name:           nbdkit
-Version:        1.16.0
+Version:        1.16.2
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -550,8 +554,7 @@ for %{name}.
 
 %prep
 %if 0%{verify_tarball_signature}
-tmphome="$(mktemp -d)"
-gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %endif
 %autosetup -p1
 %if 0%{patches_touch_autotools}
@@ -560,7 +563,7 @@ autoreconf -i
 
 %ifnarch %{complete_test_arches}
 # Simplify the test suite so it doesn't require qemu.
-sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
+sed -i -e '/^LIBGUESTFS_TESTS/d' tests/Makefile.am
 sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
 autoreconf -i
 %endif
@@ -604,6 +607,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
 # Workaround for broken libvirt (RHBZ#1138604).
 mkdir -p $HOME/.cache/libvirt
 
+# tests/test-captive.sh is racy especially on s390x.  We need to
+# rethink this test upstream.
+truncate -s 0 tests/test-captive.sh
+
 # Temporarily kill tests/test-shutdown.sh because this test is racy on
 # slow hardware.
 truncate -s 0 tests/test-shutdown.sh
@@ -903,44 +910,25 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Jan 28 2020 Richard W.M. Jones <rjones@redhat.com> - 1.16.2-1
+- New stable release 1.16.2.
+
+* Tue Dec  3 2019 Richard W.M. Jones <rjones@redhat.com> - 1.16.1-1
+- New stable release 1.16.1.
+- Use gpgverify macro instead of explicit gpgv2 command.
+
 * Thu Nov 14 2019 Richard W.M. Jones <rjones@redhat.com> - 1.16.0-1
 - New stable release 1.16.0.
 
-* Sat Nov 09 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.8-1
-- New upstream version 1.15.8.
-- Add new nbdkit-release-notes-* man pages.
-
-* Wed Nov 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.7-1
-- New upstream version 1.15.7.
-
-* Fri Oct 24 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.6-1
-- New upstream version 1.15.6.
-
-* Sat Oct 19 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.5-1
-- New upstream release 1.15.5.
-
-* Tue Oct  1 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.4-1
-- New upstream release 1.15.4.
-- New nbdkit-security(1) man page.
-- Rename nbdkit-reflection-plugin to nbdkit-info-plugin.
-
-* Wed Sep 25 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.3-1
-- New upstream release 1.15.3.
-- Add new header file nbd-protocol.h to devel subpackage.
-
-* Fri Sep 20 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.2-1
-- New upstream version 1.15.2.
+* Fri Sep 20 2019 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-1
+- New upstream version 1.14.2.
 - Fixes second Denial of Service attack:
   https://www.redhat.com/archives/libguestfs/2019-September/msg00272.html
-- Add new nbdkit-reflection-plugin.
-- Add new nbdkit-retry-filter.
 
-* Thu Sep 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.15.1-1
-- New upstream version 1.15.1.
+* Thu Sep 12 2019 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-1
+- New upstream version 1.14.1.
 - Fixes Denial of Service / Amplication Attack:
   https://www.redhat.com/archives/libguestfs/2019-September/msg00084.html
-- Add nbdsh BR for tests.
-- Package <nbdkit-version.h>.
 
 * Thu Aug 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.14.0-2
 - Split out nbdkit-nbd-plugin subpackage.
diff --git a/sources b/sources
index 2e8a5d5..1562891 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.16.0.tar.gz) = 71f38d0290f6ae9bb765d728857b7eaee12d3960d46ad760f9ebe76c747a26fa72a770982af94d43cda5631f90a3c24002ca671aba599e674e929dcafa533e6e
-SHA512 (nbdkit-1.16.0.tar.gz.sig) = bedc654fc3dd5b08415f482678fb7eba4a4c590d139176b0a08833642ee1503af36e868d80dbbeb3ad1e869b2ba001d6f997f8b516988963787e2c00ca4eabb3
+SHA512 (nbdkit-1.16.2.tar.gz) = 3b3fe72373a4094e5c26dc9ea3e10d9f859524c0cacea33dbae0ee127a9e8bfadc277dc909c5240a7b918effcf67a790810adf6b2ebcd0a87dc4995d78c14a86
+SHA512 (nbdkit-1.16.2.tar.gz.sig) = 73feb233fe74e1e303fdca8441b9321b78d77fdb9a61de43037ffdbab0262376ad7e9b4c0d4f2182668f9aceec64886ca4b1cef90609d70306ce4cbe3a34e216