diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99f97957..44486ec3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [6.0.4] - 2024-01-03
 ### Changed
 - Changes to window detection logic [#2036](https://github.com/koekeishiya/yabai/issues/2036)
 
@@ -528,7 +530,8 @@ The *window_destroyed* signal is now triggered for windows that are implicitly d
 ### Added
 - First official release
 
-[Unreleased]: https://github.com/koekeishiya/yabai/compare/v6.0.3...HEAD
+[Unreleased]: https://github.com/koekeishiya/yabai/compare/v6.0.4...HEAD
+[6.0.4]: https://github.com/koekeishiya/yabai/compare/v6.0.3...v6.0.4
 [6.0.3]: https://github.com/koekeishiya/yabai/compare/v6.0.2...v6.0.3
 [6.0.2]: https://github.com/koekeishiya/yabai/compare/v6.0.1...v6.0.2
 [6.0.1]: https://github.com/koekeishiya/yabai/compare/v6.0.0...v6.0.1
diff --git a/src/yabai.c b/src/yabai.c
index 92d0de8b..0d6d7cd5 100644
--- a/src/yabai.c
+++ b/src/yabai.c
@@ -22,7 +22,7 @@
 
 #define MAJOR  6
 #define MINOR  0
-#define PATCH  3
+#define PATCH  4
 
 struct event_loop g_event_loop;
 void *g_workspace_context;