diff --git a/Makefile b/Makefile
index 4b7965880..0e15d9a1a 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endif
 THIRD_PARTY= $(ACPICA_DIR)/.vendored $(LWIPDIR)/.vendored $(MBEDTLS_DIR)/.vendored
 
 $(ACPICA_DIR)/.vendored: GITFLAGS= --depth 1  https://github.com/acpica/acpica.git -b R09_30_21
-$(LWIPDIR)/.vendored: GITFLAGS= --depth 1  https://github.com/nanovms/lwip.git -b STABLE-2_1_x
+$(LWIPDIR)/.vendored: GITFLAGS= --depth 1  https://github.com/tpjg/lwip.git -b STABLE-2_1_x
 $(MBEDTLS_DIR)/.vendored: GITFLAGS= --depth 1 https://github.com/nanovms/mbedtls.git
 
 kernel: $(THIRD_PARTY) contgen
diff --git a/platform/pc/Makefile b/platform/pc/Makefile
index 67f0bfdd9..099f80a9f 100644
--- a/platform/pc/Makefile
+++ b/platform/pc/Makefile
@@ -149,6 +149,8 @@ SRCS-lwip= \
 	$(LWIPDIR)/src/core/ipv4/ip4_addr.c \
 	$(LWIPDIR)/src/core/ipv4/ip4_frag.c \
 	$(LWIPDIR)/src/core/ipv4/ip4.c \
+	$(LWIPDIR)/src/core/ipv4/ip4_route_table.c \
+	$(LWIPDIR)/src/core/ipv4/dhcp_classless_route.c \
 	$(LWIPDIR)/src/core/ipv6/dhcp6.c \
 	$(LWIPDIR)/src/core/ipv6/ethip6.c \
 	$(LWIPDIR)/src/core/ipv6/icmp6.c \
diff --git a/platform/riscv-virt/Makefile b/platform/riscv-virt/Makefile
index 3e59bc388..53a17b8af 100644
--- a/platform/riscv-virt/Makefile
+++ b/platform/riscv-virt/Makefile
@@ -108,6 +108,8 @@ SRCS-lwip= \
 	$(LWIPDIR)/src/core/ipv4/ip4_addr.c \
 	$(LWIPDIR)/src/core/ipv4/ip4_frag.c \
 	$(LWIPDIR)/src/core/ipv4/ip4.c \
+	$(LWIPDIR)/src/core/ipv4/ip4_route_table.c \
+	$(LWIPDIR)/src/core/ipv4/dhcp_classless_route.c \
 	$(LWIPDIR)/src/core/ipv6/dhcp6.c \
 	$(LWIPDIR)/src/core/ipv6/ethip6.c \
 	$(LWIPDIR)/src/core/ipv6/icmp6.c \
diff --git a/platform/virt/Makefile b/platform/virt/Makefile
index fc870390c..f5eab9cff 100644
--- a/platform/virt/Makefile
+++ b/platform/virt/Makefile
@@ -136,6 +136,8 @@ SRCS-lwip= \
 	$(LWIPDIR)/src/core/ipv4/ip4_addr.c \
 	$(LWIPDIR)/src/core/ipv4/ip4_frag.c \
 	$(LWIPDIR)/src/core/ipv4/ip4.c \
+	$(LWIPDIR)/src/core/ipv4/ip4_route_table.c \
+	$(LWIPDIR)/src/core/ipv4/dhcp_classless_route.c \
 	$(LWIPDIR)/src/core/ipv6/dhcp6.c \
 	$(LWIPDIR)/src/core/ipv6/ethip6.c \
 	$(LWIPDIR)/src/core/ipv6/icmp6.c \
diff --git a/src/net/lwipopts.h b/src/net/lwipopts.h
index a58ff75a1..e2596b5a2 100644
--- a/src/net/lwipopts.h
+++ b/src/net/lwipopts.h
@@ -198,3 +198,5 @@ static inline int net_ip_input_hook(struct pbuf *pbuf, struct netif *input_netif
         return 1;
     return 0;
 }
+
+#define LWIP_DHCP_CLASSLESS_STATIC_ROUTES  1