diff --git a/nbdkit.spec b/nbdkit.spec
index 6b2483c..00c9f9f 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -1,8 +1,14 @@
 %global _hardened_build 1
 
 %ifarch %{kernel_arches}
-# ... except that it doesn't work on s390, so:
-%ifnarch s390 s390x
+# riscv64 tests fail with
+# qemu-system-riscv64: invalid accelerator kvm
+# qemu-system-riscv64: falling back to tcg
+# qemu-system-riscv64: unable to find CPU model 'host'
+# This seems to require changes in libguestfs and/or qemu to support
+# -cpu max or -cpu virt.
+# s390x builders can't run libguestfs
+%ifnarch riscv64 s390 s390x
 %global have_libguestfs 1
 %endif
 %endif
@@ -24,8 +30,7 @@
 # it as a bug and add it to this list.
 #
 # armv7, aarch64: https://bugzilla.redhat.com/show_bug.cgi?id=1893892
-#global broken_test_arches NONE
-%global broken_test_arches %{arm} aarch64
+%global broken_test_arches NONE
 
 %if 0%{?rhel} == 7
 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and
@@ -39,18 +44,18 @@ ExclusiveArch:  x86_64
 %global verify_tarball_signature 1
 
 # If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools 1
+%global patches_touch_autotools %{nil}
 
 # The source directory.
 %global source_directory 1.25-development
 
 Name:           nbdkit
-Version:        1.25.4
-Release:        2%{?dist}
+Version:        1.25.7
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
-URL:            https://github.com/libguestfs/nbdkit
+URL:            https://gitlab.com/nbdkit/nbdkit
 
 %if 0%{?rhel} >= 8
 # On RHEL 8+, we cannot build the package on i686 (no virt stack).
@@ -1218,8 +1223,19 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.25.4-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed May 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.7-1
+- New upstream version 1.25.7.
+- Disable libguestfs tests on riscv64.
+
+* Sat Apr 10 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.6-1
+- New upstream version 1.25.6.
+
+* Sat Apr 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.5-1
+- New upstream version 1.25.5.
+
+* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.4-2
+- Fix upstream URL.
+- Enable non-guestfs tests on all arches.
 
 * Wed Mar 10 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.4-1
 - New upstream development version 1.25.4.
diff --git a/sources b/sources
index 2fa8882..db5b068 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.25.4.tar.gz) = 59d20e16cac56013c15f81fb41bc95f45fdbb22d6977bfed9b078ef15a9a551214dba2cc6ce8bf6a6859c43f424bb98455a3ebb351eb79b486491df6a8a8e85a
-SHA512 (nbdkit-1.25.4.tar.gz.sig) = 0e1a39111999efaf3e19f2ed73b546b2e96e45bab2f351057ff3e0a1f0119f8416d9e645149dd2446b6ea66c360d1984986df609b293227d4841aac94f631143
+SHA512 (nbdkit-1.25.7.tar.gz) = a4ff0045971bddb89ace27968f4248c1302fbc9aa7e19a417f3bb79e78c531cf9a561c5dccb66580378a0f6b2bbe7b344ba7a6eb88e3bc3bf2dedb275bfeafff
+SHA512 (nbdkit-1.25.7.tar.gz.sig) = f28c2aeaaa142767408d537d3e01437c24385c22e6a20cccb76edd6c9edc3fb82dc835cf65dcc4718bed90e31c458bbfe3b205bb3557013ed2ae2164321b080d