diff --git a/.gitmodules b/.gitmodules
index b2b19789..bfc0f7bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,9 @@
 [submodule "riscv-newlib"]
 	path = riscv-newlib
 	url = ../riscv-newlib.git
-[submodule "riscv-qemu"]
-	path = riscv-qemu
-	url = ../riscv-qemu.git
 [submodule "riscv-gdb"]
 	path = riscv-gdb
 	url = ../riscv-binutils-gdb.git
+[submodule "qemu"]
+	path = qemu
+	url = https://git.qemu.org/git/qemu.git
diff --git a/Makefile.in b/Makefile.in
index 8c89d578..c7938b72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -687,7 +687,7 @@ stamps/build-gcc-musl-stage2: $(srcdir)/riscv-gcc stamps/build-musl-linux \
 	mkdir -p $(dir $@) && touch $@
 
 
-stamps/build-qemu: $(srcdir)/riscv-qemu
+stamps/build-qemu: $(srcdir)/qemu
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)
 	cd $(notdir $@) && $</configure \
diff --git a/qemu b/qemu
new file mode 160000
index 00000000..57dfc2c4
--- /dev/null
+++ b/qemu
@@ -0,0 +1 @@
+Subproject commit 57dfc2c4d51e770ed3f617e5d1456d1e2bacf3f0
diff --git a/riscv-qemu b/riscv-qemu
deleted file mode 160000
index ff36f2f7..00000000
--- a/riscv-qemu
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff36f2f77ec3e6a6211c63bfe1707ec057b12f7d