diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f339e54
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libesphttpd"]
+	path = libesphttpd
+	url = http://git.spritesserver.nl/libesphttpd.git/
diff --git a/Makefile b/Makefile
index 3ead9ac..5e81ac0 100644
--- a/Makefile
+++ b/Makefile
@@ -116,8 +116,13 @@ endef
 
 all: checkdirs $(TARGET_OUT) $(FW_BASE)
 
-libesphttpd:
-	make -C libesphttpd
+libesphttpd/Makefile:
+	$(Q) echo "No libesphttpd submodule found. Using git to fetch it..."
+	$(Q) git submodule init
+	$(Q) git submodule update
+
+libesphttpd: libesphttpd/Makefile
+	$(Q) make -C libesphttpd
 
 $(TARGET_OUT): $(APP_AR) libesphttpd
 	$(vecho) "LD $@"
diff --git a/libesphttpd b/libesphttpd
new file mode 160000
index 0000000..c35a585
--- /dev/null
+++ b/libesphttpd
@@ -0,0 +1 @@
+Subproject commit c35a585ebf5875be90588ea9d4f7fdf4363d8bbc