diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8a004599cf..0e809c702fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
 
+### Fixes
+
+- Improve error for `args_conflicts_with_subcommands`
+- Ensure we error for `args_conflicts_with_subcommands` when using subcommand short and long flags
+
 ## [4.4.14] - 2024-01-08
 
 ### Documentation
diff --git a/clap_mangen/CHANGELOG.md b/clap_mangen/CHANGELOG.md
index 2fb4cc25f31..18a81302345 100644
--- a/clap_mangen/CHANGELOG.md
+++ b/clap_mangen/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
 
+### Fixes
+
+- Correctly show help for fake flags
+
 ## [0.2.16] - 2023-12-28
 
 ### Performance