diff --git a/ChangeLog b/ChangeLog
index 36e60e1c9..2242a5b5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,10 @@ Latest:
 ------
  For even more detail, use "git log" or visit https://github.com/LINBIT/drbd/commits/master.
 
-9.2.4-rc.1 (api:genl2/proto:110-122/transport:18)
+9.2.4 (api:genl2/proto:110-122/transport:18)
 --------
  * fix a possible deadlock when disconnecting during a resync
+ * fix a possible hard kernel-lockup
  * changes merged from drbd-9.1.15
   - fix how flush requests are marked when submitted to the Linux IO
     stack on the secondary node
diff --git a/debian/changelog b/debian/changelog
index d8750d712..428482e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-drbd (9.2.4~rc.1-1) unstable; urgency=medium
+drbd (9.2.4-1) unstable; urgency=medium
 
   * New upstream release
 
- -- Philipp Reisner <philipp.reisner@linbit.com>  Fri, 26 May 2023 11:31:43 +0200
+ -- Philipp Reisner <philipp.reisner@linbit.com>  Mon,  5 Jun 2023 09:00:00 +0200
 
 drbd (9.2.3-1) unstable; urgency=medium
 
diff --git a/docker/Dockerfile.rhel7 b/docker/Dockerfile.rhel7
index e53424796..5313c727b 100644
--- a/docker/Dockerfile.rhel7
+++ b/docker/Dockerfile.rhel7
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi7/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-ENV DRBD_VERSION 9.2.4-rc.1
+ENV DRBD_VERSION 9.2.4
 
 ARG release=1
 LABEL name="DRBD Kernel module load container" \
diff --git a/docker/Dockerfile.rhel8 b/docker/Dockerfile.rhel8
index 4b01e3670..32caa4754 100644
--- a/docker/Dockerfile.rhel8
+++ b/docker/Dockerfile.rhel8
@@ -8,7 +8,7 @@ RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-
 FROM registry.access.redhat.com/ubi8/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-ENV DRBD_VERSION 9.2.4-rc.1
+ENV DRBD_VERSION 9.2.4
 
 ARG release=1
 LABEL name="DRBD Kernel module load container" \
diff --git a/docker/Dockerfile.rhel9 b/docker/Dockerfile.rhel9
index 2650ff455..312f42f4a 100644
--- a/docker/Dockerfile.rhel9
+++ b/docker/Dockerfile.rhel9
@@ -8,7 +8,7 @@ RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-
 FROM registry.access.redhat.com/ubi9/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-ENV DRBD_VERSION 9.2.4-rc.1
+ENV DRBD_VERSION 9.2.4
 
 ARG release=1
 LABEL name="DRBD Kernel module load container" \
diff --git a/drbd-kernel.spec b/drbd-kernel.spec
index 53629a34c..82054ec3d 100644
--- a/drbd-kernel.spec
+++ b/drbd-kernel.spec
@@ -1,6 +1,6 @@
 Name: drbd-kernel
 Summary: Kernel driver for DRBD
-Version: 9.2.4~rc.1
+Version: 9.2.4
 Release: 1
 
 # always require a suitable userland
@@ -140,7 +140,7 @@ install -D misc/SECURE-BOOT-KEY-linbit.com.der $RPM_BUILD_ROOT/etc/pki/linbit/SE
 rm -rf %{buildroot}
 
 %changelog
-* Fri May 26 2023 Philipp Reisner <phil@linbit.com> - 9.2.4~rc.1
+* Mon Jun 05 2023 Philipp Reisner <phil@linbit.com> - 9.2.4
 -  New upstream release.
 
 * Tue Apr 04 2023 Philipp Reisner <phil@linbit.com> - 9.2.3
diff --git a/drbd/linux/drbd_config.h b/drbd/linux/drbd_config.h
index e5cdb0c2a..3b681f0f1 100644
--- a/drbd/linux/drbd_config.h
+++ b/drbd/linux/drbd_config.h
@@ -9,7 +9,7 @@
 
 extern const char *drbd_buildtag(void);
 
-#define REL_VERSION "9.2.4-rc.1"
+#define REL_VERSION "9.2.4"
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 122