diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e4b0a50
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "geeboard_firmware/qmk_firmware"]
+	path = external/qmk_firmware
+	url = https://github.com/qmk/qmk_firmware.git
diff --git a/external/qmk_firmware b/external/qmk_firmware
new file mode 160000
index 0000000..ba63bac
--- /dev/null
+++ b/external/qmk_firmware
@@ -0,0 +1 @@
+Subproject commit ba63bac661c3c6154f3b42a85167b3552d29f0f8
diff --git a/geeboard_firmware/Makefile b/geeboard_firmware/Makefile
new file mode 100644
index 0000000..4fdec15
--- /dev/null
+++ b/geeboard_firmware/Makefile
@@ -0,0 +1,23 @@
+# Inspired by Makefile from https://github.com/Felerius/planck-layout
+
+keyboard := geeboard
+layout := default
+qmk_dir := ../external/qmk_firmware
+keyboard_dir := ${qmk_dir}/keyboards/${keyboard}
+
+.PHONY: build
+build: ${keyboard_dir}
+	$(MAKE) -C ${qmk_dir} ${keyboard}:${layout}
+
+.PHONY: flash
+flash: ${keyboard_dir}
+	$(MAKE) -C ${qmk_dir} ${keyboard}:${layout}:flash
+
+.PHONY: clean
+clean:
+	$(MAKE) -C ${qmk_dir} clean
+	rm ${keyboard_dir}
+
+${keyboard_dir}:
+	ln -sf "../../../geeboard_firmware" $@
+