diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73088716..1e62619e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,8 @@ eive-tmtc: v2.12.7
 
 ## Added
 
+- git post checkout hook which initializes and updates the submodules
+  automatically.
 - In case the ACS Controller does recognize more than one RW to be invalid and therefore not
   available, it does not perform pointing control but aborts shortly after `sensorProcessing`. If the
   problem persits for 5 ACS cycles, the `MULTIPLE_RW_INVALID` event is triggered, which invokes the
diff --git a/clone-submodules-no-privlibs.sh b/clone-submodules-no-privlibs.sh
index ae08a9ce..48d34bc2 100755
--- a/clone-submodules-no-privlibs.sh
+++ b/clone-submodules-no-privlibs.sh
@@ -1,3 +1,6 @@
 #!/bin/bash
 
+root="$(pwd)"
+ln -s "$root/hooks" "$root/.git/hooks"
+
 git submodule update --init fsfw thirdparty/rapidcsv thirdparty/lwgps thirdparty/json
diff --git a/fsfw b/fsfw
index a6d707a7..be015b4c 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit a6d707a7db589136ac2bd917cd8b3a3e2c16a0e4
+Subproject commit be015b4c669995dc55bc316b006699be8542d941
diff --git a/hooks/post-checkout b/hooks/post-checkout
new file mode 100755
index 00000000..bfddad44
--- /dev/null
+++ b/hooks/post-checkout
@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+# update submodules after checkout
+
+git submodule init
+git submodule update