diff --git a/hermit/Makefile b/hermit/Makefile
index 529b89073..a3c4bf04e 100644
--- a/hermit/Makefile
+++ b/hermit/Makefile
@@ -3,7 +3,8 @@ TOPDIR := $(shell pwd)
 ARCH = x86
 NAME = libhermit.a
 DRIVERDIRS = drivers/net
-KERNDIRS = kernel mm libkern arch/$(ARCH)/kernel arch/$(ARCH)/mm $(DRIVERDIRS)
+LWIPDIRS = lwip/src/arch lwip/src/api lwip/src/core lwip/src/core/ipv4 lwip/src/netif
+KERNDIRS = kernel mm libkern arch/$(ARCH)/kernel arch/$(ARCH)/mm $(LWIPDIRS) $(DRIVERDIRS)
 SUBDIRS = $(KERNDIRS)
 GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags)
 TODAY := $(shell date +'%Y%m%d')
@@ -59,25 +60,6 @@ default: all
 all: bootstrap $(NAME) toolchain tools
 
 toolchain:
-	$Q$(MAKE) ARCH=$(ARCH) \
-		LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_NEWLIB)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_NEWLIB)" \
-		FFLAGS_FOR_TARGET="$(FFLAGS_FOR_NEWLIB)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_NEWLIB)" \
-		NASMFLAGS="$(NASMFLAGS_FOR_NEWLIB)" \
-		CC_FOR_TARGET=$(CC_FOR_TARGET) \
-		FC_FOR_TARGET=$(FC_FOR_TARGET) \
-		CXX_FOR_TARGET=$(CXX_FOR_TARGET) \
-		GCC_FOR_TARGET=$(GCC_FOR_TARGET) \
-		AR_FOR_TARGET=$(AR_FOR_TARGET) \
-		AS_FOR_TARGET=$(AS_FOR_TARGET) \
-		LD_FOR_TARGET=$(LD_FOR_TARGET) \
-		NM_FOR_TARGET=$(NM_FOR_TARGET) \
-		OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET) \
-		OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET) \
-		RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET) \
-		STRIP_FOR_TARGET=$(STRIP_FOR_TARGET) \
-		READELF_FOR_TARGET=$(READELF_FOR_TARGET) -C lwip all
 	$Q$(MAKE) ARCH=$(ARCH) \
 		LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_NEWLIB)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_NEWLIB)" \
@@ -97,7 +79,6 @@ toolchain:
 		RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET) \
 		STRIP_FOR_TARGET=$(STRIP_FOR_TARGET) \
 		READELF_FOR_TARGET=$(READELF_FOR_TARGET) -C usr toolchain
-	#$Qcp -R lwip/src/include/lwip* usr/$(ARCH)/$(CROSSCOMPREFIX)/include
 
 bootstrap:
 	$Q$(MAKE) ARCH=$(ARCH) CFLAGS="" LDFLAGS="" -C usr bootstrap
@@ -112,14 +93,12 @@ $(NAME):
 
 clean:
 	$Q$(RM) $(NAME) $(NAME).sym $(NAME).bin *~
-	$Q$(MAKE) -C lwip clean
 	$Q$(MAKE) -C tools clean
 	$Q$(MAKE) -C usr clean
 	@echo Cleaned.
 
 veryclean: clean
 	$Q$(RM) qemu-vlan0.pcap include/hermit/config.inc
-	$Q$(MAKE) -C lwip veryclean
 	$Q$(MAKE) -C tools veryclean
 	$Q$(MAKE) -C usr veryclean
 	@echo Very cleaned
diff --git a/hermit/lwip b/hermit/lwip
index 0e132903d..cf00aee08 160000
--- a/hermit/lwip
+++ b/hermit/lwip
@@ -1 +1 @@
-Subproject commit 0e132903d455bbdc2752b17f1f957d629ce5466e
+Subproject commit cf00aee089047c3356b558423b368a85fc76caa7
diff --git a/hermit/usr/gcc b/hermit/usr/gcc
index 3164d9205..65a2efba8 160000
--- a/hermit/usr/gcc
+++ b/hermit/usr/gcc
@@ -1 +1 @@
-Subproject commit 3164d9205b9569f709ddfafcb95fc0f50cb4a656
+Subproject commit 65a2efba86f132e99afabedaf32ed069a74c3142