diff --git a/nbdkit.spec b/nbdkit.spec
index d3a63f9..4268a53 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -45,7 +45,7 @@ ExclusiveArch:  x86_64
 %global source_directory 1.25-development
 
 Name:           nbdkit
-Version:        1.25.2
+Version:        1.25.4
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -135,7 +135,9 @@ BuildRequires:  %{_bindir}/qemu-img
 BuildRequires:  %{_bindir}/qemu-io
 BuildRequires:  %{_bindir}/qemu-nbd
 BuildRequires:  %{_sbindir}/sfdisk
+%if !0%{?rhel}
 BuildRequires:  %{_bindir}/socat
+%endif
 BuildRequires:  %{_sbindir}/ss
 BuildRequires:  %{_bindir}/stat
 BuildRequires:  %{_bindir}/ssh-keygen
@@ -533,6 +535,8 @@ Summary:        VMware VDDK plugin for %{name}
 License:        BSD
 
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1931818
+Requires:       libxcrypt-compat
 
 
 %description vddk-plugin
@@ -562,6 +566,7 @@ Provides:       %{name}-fua-filter = %{version}-%{release}
 Provides:       %{name}-ip-filter = %{version}-%{release}
 Provides:       %{name}-limit-filter = %{version}-%{release}
 Provides:       %{name}-log-filter = %{version}-%{release}
+Provides:       %{name}-multi-conn-filter = %{version}-%{release}
 Provides:       %{name}-nocache-filter = %{version}-%{release}
 Provides:       %{name}-noextents-filter = %{version}-%{release}
 Provides:       %{name}-nofilter-filter = %{version}-%{release}
@@ -616,6 +621,8 @@ nbdkit-limit-filter        Limit nr clients that can connect concurrently.
 
 nbdkit-log-filter          Log all transactions to a file.
 
+nbdkit-multi-conn-filter   Enable, emulate or disable multi-conn.
+
 nbdkit-nocache-filter      Disable cache requests in the underlying plugin.
 
 nbdkit-noextents-filter    Disable extents in the underlying plugin.
@@ -1090,6 +1097,7 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/filters/nbdkit-ip-filter.so
 %{_libdir}/%{name}/filters/nbdkit-limit-filter.so
 %{_libdir}/%{name}/filters/nbdkit-log-filter.so
+%{_libdir}/%{name}/filters/nbdkit-multi-conn-filter.so
 %{_libdir}/%{name}/filters/nbdkit-nocache-filter.so
 %{_libdir}/%{name}/filters/nbdkit-noextents-filter.so
 %{_libdir}/%{name}/filters/nbdkit-nofilter-filter.so
@@ -1121,6 +1129,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-ip-filter.1*
 %{_mandir}/man1/nbdkit-limit-filter.1*
 %{_mandir}/man1/nbdkit-log-filter.1*
+%{_mandir}/man1/nbdkit-multi-conn-filter.1*
 %{_mandir}/man1/nbdkit-nocache-filter.1*
 %{_mandir}/man1/nbdkit-noextents-filter.1*
 %{_mandir}/man1/nbdkit-nofilter-filter.1*
@@ -1209,6 +1218,22 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Wed Mar 10 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.4-1
+- New upstream development version 1.25.4.
+- New filter: multi-conn
+
+* Tue Mar  9 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.3-3
+- Make nbdkit-vddk-plugin depend on libxcrypt-compat (RHBZ#1931818).
+
+* Thu Mar  4 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.3-2
+- Remove socat dependency in RHEL 9.
+
+* Tue Mar  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.3-1
+- New upstream development version 1.25.3.
+
+* Tue Mar  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.2-2
+- OCaml 4.12.0 build (RHBZ#1934138).
+
 * Wed Feb 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.2-1
 - New upstream development version 1.25.2.
 - Remove all remaining traces of nbdkit-gzip-plugin and nbdkit-tar-plugin.
diff --git a/sources b/sources
index 7a2926b..2fa8882 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.25.2.tar.gz) = 1b0e55cbe3d043a6dc16e3d5291d1eca01b2c93ea3b8ff4a2e8bcdf65d39f4997c816386981d7cc2f8a052c641b92129aa6963361e1c21358618fcd274553b29
-SHA512 (nbdkit-1.25.2.tar.gz.sig) = 55866ea439409e64e1ff1bab82a69c78ad088690632cf27b5f9d4f8759256deb26ef932c68dcd8fa551cd7e2a0eaaf4223ce56b663d34e4015dfa0328b6270e1
+SHA512 (nbdkit-1.25.4.tar.gz) = 59d20e16cac56013c15f81fb41bc95f45fdbb22d6977bfed9b078ef15a9a551214dba2cc6ce8bf6a6859c43f424bb98455a3ebb351eb79b486491df6a8a8e85a
+SHA512 (nbdkit-1.25.4.tar.gz.sig) = 0e1a39111999efaf3e19f2ed73b546b2e96e45bab2f351057ff3e0a1f0119f8416d9e645149dd2446b6ea66c360d1984986df609b293227d4841aac94f631143