diff --git a/.gitmodules b/.gitmodules
index 4a973500..6f538287 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "fsfw_hal"]
 	path = fsfw_hal
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw_hal.git
+[submodule "generators/modgen"]
+	path = generators/modgen
+	url = https://git.ksat-stuttgart.de/source/modgen.git
diff --git a/fsfw b/fsfw
index f2ab07c7..5273ffa7 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit f2ab07c78242d8211aebf9e0d6911d386dbc4ec5
+Subproject commit 5273ffa721dd83634ebbcc37c4646752f0bea20f
diff --git a/generators/modgen b/generators/modgen
new file mode 160000
index 00000000..5ed4a2ae
--- /dev/null
+++ b/generators/modgen
@@ -0,0 +1 @@
+Subproject commit 5ed4a2ae59e90c3763616bdaf41eb3317e849100