diff --git a/libnbd.spec b/libnbd.spec
index 62aa83f..59b152d 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -1,14 +1,11 @@
 # If we should verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
 
-# If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools %{nil}
-
 # The source directory.
 %global source_directory 1.18-stable
 
 Name:           libnbd
-Version:        1.18.0
+Version:        1.18.5
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -25,14 +22,13 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:        copy-patches.sh
 
-%if 0%{patches_touch_autotools}
-BuildRequires: autoconf, automake, libtool
-%endif
-
 %if 0%{verify_tarball_signature}
 BuildRequires:  gnupg2
 %endif
 
+# For rebuilding autoconf cruft.
+BuildRequires:  autoconf, automake, libtool
+
 # For the core library.
 BuildRequires:  gcc
 BuildRequires:  make
@@ -207,9 +203,7 @@ for %{name}.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %endif
 %autosetup -p1
-%if 0%{patches_touch_autotools}
 autoreconf -i
-%endif
 
 
 %build
@@ -375,8 +369,27 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Tue Jun 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1.18.5
+- New upstream stable version 1.18.5
+- Fix: multiple flaws in TLS server certificate checking
+
+* Thu Apr 04 2024 Richard W.M. Jones <rjones@redhat.com> - 1.18.4-1
+- New upstream stable version 1.18.4
+
+* Mon Mar 04 2024 Richard W.M. Jones <rjones@redhat.com> - 1.18.3-1
+- New upstream stable version 1.18.3
+
+* Tue Jan 16 2024 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-1
+- New upstream stable version 1.18.2
+
+* Tue Oct 31 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.1-2
+- Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871)
+
+* Mon Oct 23 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.1-1
+- New upstream stable version 1.18.1
+
 * Wed Sep 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.0-1
-- New upstream development version 1.18.0
+- New upstream stable version 1.18.0
 
 * Fri Sep 08 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.5-1
 - New upstream development version 1.17.5
diff --git a/sources b/sources
index 342dd92..ee43a93 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.18.0.tar.gz) = e0dc41ce8cae8d6c8efd55ad560b847dd829ad355cd67e4f682ac2ad145f3ced8ea42650ce1b2cd562a1f6f8cf05680ff2e1a5bdf5b4e5f8237b1fb8ec132a3a
-SHA512 (libnbd-1.18.0.tar.gz.sig) = a506add984fddb12bb073947cf5ef6f798c6db6aae521aced778b03d7feb0227a4cf5bc346d68ada3e3da47b533cdcfd9c4470fddf61bfa82ed148d862b5ec82
+SHA512 (libnbd-1.18.5.tar.gz) = baf9955ce2a176f0f8f48fa6e1b27066c5a3d03adcd5ebd1a63bf4651ba23a135eeb0d39d41ded94ba653aa4b9bce5da9747afb208e71a542fcad7ac8c28b106
+SHA512 (libnbd-1.18.5.tar.gz.sig) = a0db3cc49f78967a3f724dcca56b84f23007d3afcf05853d8d9cac10fb34a8d591ee30650111ff5df7184fac6ba100d6a7782b36e1f210ea9564c76d4085cfd8