diff --git a/.gitmodules b/.gitmodules
index 30532fe..9f4cc10 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "fsfw_common"]
 	path = fsfw_common
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-common.git
+[submodule "generators/fsfwgen"]
+	path = generators/fsfwgen
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-generators.git
+[submodule "fsfw"]
+	path = fsfw
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
+[submodule "tmtc/tmtccmd"]
+	path = tmtc/tmtccmd
+	url = https://github.com/spacefisch/tmtccmd.git
diff --git a/fsfw b/fsfw
new file mode 160000
index 0000000..2f51152
--- /dev/null
+++ b/fsfw
@@ -0,0 +1 @@
+Subproject commit 2f511523cb71e00b4669db002b171d626a63fddf
diff --git a/generators/fsfwgen b/generators/fsfwgen
new file mode 160000
index 0000000..fa507cc
--- /dev/null
+++ b/generators/fsfwgen
@@ -0,0 +1 @@
+Subproject commit fa507cc4f7b947cd9e4de30e9be6167ff1c15ec7
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
new file mode 160000
index 0000000..475ac3f
--- /dev/null
+++ b/tmtc/tmtccmd
@@ -0,0 +1 @@
+Subproject commit 475ac3f8293fd92533e4d50c061d93b1c2b7f5e1