diff --git a/nbdkit.spec b/nbdkit.spec
index cd060f1..f57087e 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -23,9 +23,9 @@
 # If the test suite is broken on a particular architecture, document
 # it as a bug and add it to this list.
 #
-# aarch64: https://bugzilla.redhat.com/show_bug.cgi?id=1833346
+# armv7, aarch64: https://bugzilla.redhat.com/show_bug.cgi?id=1893892
 #global broken_test_arches NONE
-%global broken_test_arches aarch64
+%global broken_test_arches %{arm} aarch64
 
 %if 0%{?rhel} == 7
 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and
@@ -45,7 +45,7 @@ ExclusiveArch:  x86_64
 %global source_directory 1.23-development
 
 Name:           nbdkit
-Version:        1.23.7
+Version:        1.23.9
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -98,6 +98,7 @@ BuildRequires:  platform-python-devel
 %else
 BuildRequires:  python3-devel
 %endif
+BuildRequires:  python3-boto3
 %if !0%{?rhel}
 %if 0%{?have_ocaml}
 # Requires OCaml 4.02.2 which contains fix for
@@ -471,6 +472,22 @@ This package lets you write Ruby plugins for %{name}.
 %endif
 
 
+# In theory this is noarch, but because plugins are placed in _libdir
+# which varies across architectures, RPM does not allow this.
+%package S3-plugin
+Summary:        Amazon S3 and Ceph plugin for %{name}
+License:        BSD
+
+Requires:       %{name}-python-plugin >= 1.22
+# XXX Should not need to add this.
+Requires:       python3-boto3
+
+
+%description S3-plugin
+This package lets you open disk images stored in Amazon S3
+or Ceph using %{name}.
+
+
 %package ssh-plugin
 Summary:        SSH plugin for %{name}
 License:        BSD
@@ -577,6 +594,7 @@ Provides:       %{name}-ddrescue-filter = %{version}-%{release}
 Provides:       %{name}-delay-filter = %{version}-%{release}
 Provides:       %{name}-error-filter = %{version}-%{release}
 Provides:       %{name}-exitlast-filter = %{version}-%{release}
+Provides:       %{name}-exitwhen-filter = %{version}-%{release}
 Provides:       %{name}-exportname-filter = %{version}-%{release}
 Provides:       %{name}-extentlist-filter = %{version}-%{release}
 Provides:       %{name}-fua-filter = %{version}-%{release}
@@ -621,6 +639,8 @@ nbdkit-error-filter        Inject errors.
 
 nbdkit-exitlast-filter     Exit on last client connection.
 
+nbdkit-exitwhen-filter     Exit gracefully when an event occurs.
+
 nbdkit-exportname-filter   Adjust export names between client and plugin.
 
 nbdkit-extentlist-filter   Place extent list over a plugin.
@@ -1032,6 +1052,13 @@ export LIBGUESTFS_TRACE=1
 %endif
 
 
+%files S3-plugin
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
+%{_mandir}/man1/nbdkit-S3-plugin.1*
+
+
 %files ssh-plugin
 %doc README
 %license LICENSE
@@ -1098,6 +1125,7 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/filters/nbdkit-delay-filter.so
 %{_libdir}/%{name}/filters/nbdkit-error-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exitlast-filter.so
+%{_libdir}/%{name}/filters/nbdkit-exitwhen-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exportname-filter.so
 %{_libdir}/%{name}/filters/nbdkit-extentlist-filter.so
 %{_libdir}/%{name}/filters/nbdkit-fua-filter.so
@@ -1127,6 +1155,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-delay-filter.1*
 %{_mandir}/man1/nbdkit-error-filter.1*
 %{_mandir}/man1/nbdkit-exitlast-filter.1*
+%{_mandir}/man1/nbdkit-exitwhen-filter.1*
 %{_mandir}/man1/nbdkit-exportname-filter.1*
 %{_mandir}/man1/nbdkit-extentlist-filter.1*
 %{_mandir}/man1/nbdkit-fua-filter.1*
@@ -1207,6 +1236,14 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Thu Nov 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.9-1
+- New upstream development version 1.23.9.
+- Add nbdkit-S3-plugin.
+
+* Mon Nov 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.8-1
+- New upstream development version 1.23.8.
+- Add nbdkit-exitwhen-filter.
+
 * Mon Oct 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.7-1
 - New upstream development version 1.23.7.
 - Add new NBDKit(3) man page for the OCaml plugin.
diff --git a/sources b/sources
index 90f169d..7df2c3c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.23.7.tar.gz) = 36db9c528e76fc801883bbdfbe1574c830c432c1d44596c5915f758e7dca0d6080ff6a60acf6c7a31a62caf85bbccb3fe3a9d4037ebe10767a40ffb9f82c9e34
-SHA512 (nbdkit-1.23.7.tar.gz.sig) = 726b320e5539fbeb4468d936c188dc2096c579ffc09b2c0392b08eee6c5d89d6b92d4e22c8c7932cec8e30d01ddfa4a73b169a85e47d0d3cbacc10d493a9206f
+SHA512 (nbdkit-1.23.9.tar.gz) = 7058f975fed858a3ae93a6b527aac14e6dba34420857d44a89a7f1f295021ca58bd1cb1ba89787be839a2de26130fa0e56b6e723b2a71e2bb26e2c6adbf11e21
+SHA512 (nbdkit-1.23.9.tar.gz.sig) = e4cc674966795f9453cc724e661aa3ce64d8adf0263b905bb5bce06b03459cd74ad12c3d33d4b2b9568a5e16e17024cd80e5736cc4c325ac3aa5d10930abc355