diff --git a/.gitmodules b/.gitmodules
index c0a50e1..bc6cb09 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "treebird"]
 	path = treebird
 	url = https://git.nekobit.net/repos/treebird.git
+[submodule "mastodont-c"]
+	path = mastodont-c
+	url = https://git.nekobit.net/repos/mastodont-c.git
diff --git a/build_setup.sh b/build_setup.sh
new file mode 100755
index 0000000..927c921
--- /dev/null
+++ b/build_setup.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Setup steps to preform before the actual build
+
+git submodule init
+git submodule update
+
+cp -r mastodont-c treebird/
+cp treebird/{config.def.h,config.h}
+ln -s treebird/config.h .
+
+echo "Please edit config.h (symlinked for convenience) as needed, then run ./build_container.sh"
diff --git a/mastodont-c b/mastodont-c
new file mode 160000
index 0000000..f16c12e
--- /dev/null
+++ b/mastodont-c
@@ -0,0 +1 @@
+Subproject commit f16c12e04fdff02eabfda509033c9c5c87c829e2