diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6fee72b..ddeee97b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ change warranting a new major release:
 - Build system: Fixed small bug, where the version itself was
   stored as the git SHA hash in `commonConfig.h`. This will be
   an empty string now for regular versions.
+- Bump FSFW for important fix in PUS mode service.
 
 # [v1.25.0] 2023-02-06
 
diff --git a/fsfw b/fsfw
index 38789e05..84dc7ac0 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 38789e053b65cfa14604fc625e7bcc8ca03a3f17
+Subproject commit 84dc7ac0ce4f16d93a6a5a5fcd453b2fde206dba
diff --git a/tmtc b/tmtc
index d6445d38..f16e27b7 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit d6445d38a8eb644a5e1bd27f0fc56d29e93c030d
+Subproject commit f16e27b79b9996f5a6c246cea560b783eb566d7e