diff --git a/.gitmodules b/.gitmodules
index 40c12c1fd..31acfe6ef 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,7 @@
 	path = hermit/lwip
 	url = git@github.com:RWTH-OS/LwIP.git
 	branch = hermit
+[submodule "hermit/usr/mpich"]
+	path = hermit/usr/mpich
+	url = git@github.com:RWTH-OS/mpich.git
+	branch = hermit
diff --git a/hermit/usr/Makefile b/hermit/usr/Makefile
index 6aa74c3c7..efbd3c4e8 100644
--- a/hermit/usr/Makefile
+++ b/hermit/usr/Makefile
@@ -45,7 +45,7 @@ $(TMP)/bootstrap:
 	$Q$(MKDIR) $(TMP)/bootstrap
 	$Q$(CD) $(TMP)/bootstrap; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --enable-languages=c --disable-nls --disable-shared --disable-libssp --disable-libgomp --enable-threads=posix --enable-tls && $(MAKE) $(NJOBS) all-gcc && $(MAKE) install-gcc
 
-toolchain: $(TMP)/newlib libs $(TMP)/gcc headers demo
+toolchain: $(TMP)/newlib libs $(TMP)/gcc headers $(TMP)/mpich demo
 
 $(TMP)/newlib:
 	@echo Build newlib, libpthread and libgomp
@@ -60,6 +60,10 @@ libs:
 	$Q$(MAKE) TARGET=$(TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) AR_FOR_TARGET=$(AR_FOR_TARGET) CFLAGS_FOR_TARGET+="-I. -Wall" -C ircce depend
 	$Q$(MAKE) TARGET=$(TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) AR_FOR_TARGET=$(AR_FOR_TARGET) CFLAGS_FOR_TARGET+="-I. -Wall" -C ircce
 
+$(TMP)/mpich:
+	$Q$(MKDIR) $(TMP)/mpich
+	$Q$(CD) $(TMP)/mpich; $(TOPDIR)/mpich/configure --prefix=$(TOPDIR)/$(ARCH) --enable-fast=all,O3 --enable-romio --with-pm=gforker --enable-threads=funneled && $(MAKE) && $(MAKE) install
+
 headers:
 	@echo [CP] Copy headers
 	$Q$(CP) -R ../lwip/src/include/posix/* $(TOPDIR)/$(ARCH)/$(CROSSCOMPREFIX)/include/
diff --git a/hermit/usr/mpich b/hermit/usr/mpich
new file mode 160000
index 000000000..a4121ab15
--- /dev/null
+++ b/hermit/usr/mpich
@@ -0,0 +1 @@
+Subproject commit a4121ab15f4660041503b9f967afded35c2024ad