diff --git a/.gitmodules b/.gitmodules
index cf212c9f..97b9c150 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "riscv-newlib"]
 	path = riscv-newlib
 	url = ../riscv-newlib.git
+[submodule "riscv-qemu"]
+	path = riscv-qemu
+	url = git://github.com/riscv/riscv-qemu.git
diff --git a/Makefile.in b/Makefile.in
index 040c36a4..cbbe2185 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,15 +290,24 @@ stamps/build-gcc-newlib-stage2: $(srcdir)/riscv-gcc stamps/build-newlib
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
 
-.PHONY: check-gcc-newlib
-check-gcc-newlib: stamps/build-gcc-newlib-stage2
+stamps/build-qemu: $(srcdir)/riscv-qemu
+	rm -rf $@ $(notdir $@)
+	mkdir $(notdir $@)
+	cd $(notdir $@) && $</configure \
+		--prefix=$(INSTALL_DIR) \
+		--target-list=riscv64-linux-user,riscv32-linux-user
+	$(MAKE) -C $(notdir $@)
+	$(MAKE) -C $(notdir $@) install
+	date > $@
+
+stamps/check-gcc-newlib: stamps/build-gcc-newlib-stage2 stamps/build-qemu
 	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
 	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
 	export RISC_V_SYSROOT=$(SYSROOT) && \
 	cd build-gcc-newlib-stage2 && \
 	$(MAKE) check-gcc "RUNTESTFLAGS=--target_board=riscv-sim"
 
-check-gcc-linux: stamps/build-gcc-linux-stage2
+stamps/check-gcc-linux: stamps/build-gcc-linux-stage2 stamps/build-qemu
 	export PATH=$(srcdir)/scripts/wrapper/qemu:$(INSTALL_DIR)/bin:$(PATH) && \
 	export DEJAGNULIBS=$(srcdir)/riscv-dejagnu && \
 	export RISC_V_SYSROOT=$(SYSROOT) && \
diff --git a/riscv-qemu b/riscv-qemu
new file mode 160000
index 00000000..ff36f2f7
--- /dev/null
+++ b/riscv-qemu
@@ -0,0 +1 @@
+Subproject commit ff36f2f77ec3e6a6211c63bfe1707ec057b12f7d