diff --git a/.gitmodules b/.gitmodules
index ade18620e..5f393ec1c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,15 +2,19 @@
 	path = linux
 	url = git@github.com:RWTH-OS/linux.git
 	branch = hermit
-[submodule "hermit/newlib/pte"]
-	path = hermit/newlib/pte
-	url = git@github.com:RWTH-OS/pthread-embeded.git
-	branch = hermit
-[submodule "hermit/newlib/gcc"]
-	path = hermit/newlib/gcc
+[submodule "hermit/usr/gcc"]
+	path = hermit/usr/gcc
 	url = git@github.com:RWTH-OS/gcc.git
-	branch = gcc-5-branch
-[submodule "hermit/newlib/binutils"]
-	path = hermit/newlib/binutils
+	branch = hermit
+[submodule "hermit/usr/binutils"]
+	path = hermit/usr/binutils
 	url = git@github.com:RWTH-OS/binutils.git
 	branch = hermit
+[submodule "hermit/usr/pte"]
+	path = hermit/usr/pte
+	url = git@github.com:RWTH-OS/pthread-embeded.git
+	branch = hermit
+[submodule "hermit/usr/newlib"]
+	path = hermit/usr/newlib
+	url = git@github.com:RWTH-OS/newlib.git
+	branch = hermit
diff --git a/hermit/usr/Makefile b/hermit/usr/Makefile
index 1da5ae1c7..96c18695e 100644
--- a/hermit/usr/Makefile
+++ b/hermit/usr/Makefile
@@ -29,19 +29,19 @@ $(ARCH):
 	$Q$(MKDIR) $(TMP)/binutils
 	$Q$(CD) $(TMP)/binutils; $(TOPDIR)/binutils/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --disable-shared --disable-nls --disable-gdb --disable-libdecnumber --disable-readline --disable-sim --disable-libssp --enable-tls && $(MAKE) && $(MAKE) install
 	$Q$(MKDIR) $(TMP)/newlib
-	$Q$(CD) $(TMP)/newlib; $(TOPDIR)/src/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) $(OPT) && $(MAKE) && $(MAKE) install
+	$Q$(CD) $(TMP)/newlib; $(TOPDIR)/newlib/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) $(OPT) && $(MAKE) && $(MAKE) install
 	$Q$(MAKE) TARGET=$(TARGET) CFLAGS+="-O3 -I. -Iplatform/hermit -Iplatform/helper -ffreestanding -O3 -Wall -I$(NEWLIB)/include -I../../include -I../../arch/$(ARCH)/include" LDFLAGS+="-nostdlib -L$(NEWLIB)/lib" -C pte depend
 	$Q$(MAKE) TARGET=$(TARGET) CFLAGS+="-O3 -I. -Iplatform/hermit -Iplatform/helper -ffreestanding -O3 -Wall -I$(NEWLIB)/include -I../../include -I../../arch/$(ARCH)/include" LDFLAGS+="-nostdlib -L$(NEWLIB)/lib" -C pte
 	$Q$(MKDIR) $(TMP)/gcc
 	$Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --enable-languages=c --disable-nls --disable-shared --disable-libssp --enable-threads=posix --enable-tls && $(MAKE) && $(MAKE) install
 
 clean:
-	@echo Cleaning newlib
+	@echo Cleaning toolchain
 	$Q$(MAKE) -C examples clean
 	$Q$(RM) $(TMP)
 
 veryclean:
-	@echo Propper cleaning newlib
+	@echo Propper cleaning of the toolchain
 	$Q$(MAKE) -C pte veryclean
 	$Q$(MAKE) -C examples veryclean
 	$Q$(RM) $(TOPDIR)/$(ARCH)
diff --git a/hermit/newlib/binutils b/hermit/usr/binutils
similarity index 100%
rename from hermit/newlib/binutils
rename to hermit/usr/binutils
diff --git a/hermit/newlib/gcc b/hermit/usr/gcc
similarity index 100%
rename from hermit/newlib/gcc
rename to hermit/usr/gcc
diff --git a/hermit/usr/newlib b/hermit/usr/newlib
new file mode 160000
index 000000000..f1ad593aa
--- /dev/null
+++ b/hermit/usr/newlib
@@ -0,0 +1 @@
+Subproject commit f1ad593aa47f8ac58ba13c8eb6f225f3a0f69980
diff --git a/hermit/newlib/pte b/hermit/usr/pte
similarity index 100%
rename from hermit/newlib/pte
rename to hermit/usr/pte