diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d46cc1881..b075c15acf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 2)
 set(MIR_VERSION_MINOR 16)
-set(MIR_VERSION_PATCH 3)
+set(MIR_VERSION_PATCH 4)
 
 add_compile_definitions(MIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_compile_definitions(MIR_VERSION_MINOR=${MIR_VERSION_MINOR})
diff --git a/debian/changelog b/debian/changelog
index 0c7c6236e03..023270d10f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mir (2.16.4) UNRELEASED; urgency=medium
+
+  * Bugfix release:
+    - Ignoring zero length gamma curves for KMS outputs (Fixes: #3238)
+    - Add hardware cursor support (Fixes: #3198)
+    - Screenshots now respect clipping areas and rotated outputs (Fixes: #3236)
+      (Fixes: #3259)
+    - Fixed custom attributes propagation on outputs
+      (Fixes: https://github.com/canonical/ubuntu-frame/issues/172)
+    - Handle the Ubuntu 64-bit time_t apocalypse (Fixes: #3285)
+
+ -- Matthew Kosarek <matt.kosarek@canonical.com>  Wed, 27 Mar 2024 14:34:35 -0500
+
 mir (2.16.3) UNRELEASED; urgency=medium
 
   * Bugfix release:
diff --git a/tests/acceptance-tests/wayland/CMakeLists.txt b/tests/acceptance-tests/wayland/CMakeLists.txt
index caaedda69d7..65e2edb0b4f 100644
--- a/tests/acceptance-tests/wayland/CMakeLists.txt
+++ b/tests/acceptance-tests/wayland/CMakeLists.txt
@@ -125,6 +125,7 @@ set(BROKEN_TESTS
   # See https://github.com/MirServer/wlcs/issues/293
   # (Tests pass with https://github.com/MirServer/wlcs/pull/294)
   VirtualPointerV1Test.*
+  Anchor/LayerSurfaceLayoutTest.surfaces_with_exclusive_zone_set_to_negative_one_do_not_respect_other_exclusive_zones/*
 )
 
 if (MIR_RUN_WLCS_TESTS)