diff --git a/.gitmodules b/.gitmodules
index 9e5ec1bc80..e9d7052602 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,3 +44,7 @@
 	path = firmware/ext/build-tools
 	url = https://github.com/FOME-Tech/build-tools.git
 	branch = main
+[submodule "firmware/lwip"]
+	path = firmware/lwip
+	url = https://github.com/dynfer/lwip.git
+	branch = main
\ No newline at end of file
diff --git a/firmware/Makefile b/firmware/Makefile
index ca26461764..7d9d12afac 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -190,6 +190,10 @@ ifeq ($(USE_WIFI),yes)
 endif
 
 ifeq ($(LWIP),yes)
+  lwip_dir := $(PROJECT_DIR)/lwip/src
+  # Force LWIPDIR used by lwip_bindings/lwip.mk
+  override LWIPDIR := $(lwip_dir)
+
   include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
 endif