diff --git a/.gitmodules b/.gitmodules
index 7a6ce7cf..8b5921a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "arduino"]
 	path = arduino
 	url = https://egit.irs.uni-stuttgart.de/eive/eive_arduino_interface.git
+[submodule "fsfw"]
+	path = fsfw
+	url = https://egit.irs.uni-stuttgart.de/eive/fsfw.git
diff --git a/fsfw b/fsfw
new file mode 160000
index 00000000..11a351a2
--- /dev/null
+++ b/fsfw
@@ -0,0 +1 @@
+Subproject commit 11a351a202464990641c4840569d2beff33a7b8c