diff --git a/.gitmodules b/.gitmodules
index 6594e486..76e9f6af 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,10 +9,10 @@
 [submodule "glibc"]
 	path = glibc
 	url = https://sourceware.org/git/glibc.git
-[submodule "riscv-dejagnu"]
-	path = riscv-dejagnu
-	url = https://github.com/riscv-collab/riscv-dejagnu.git
-	branch = riscv-dejagnu-1.6
+[submodule "dejagnu"]
+	path = dejagnu
+	url = https://git.savannah.gnu.org/git/dejagnu.git
+	branch = dejagnu-1.6.3
 [submodule "newlib"]
 	path = newlib
 	url = https://sourceware.org/git/newlib-cygwin.git
diff --git a/Makefile.in b/Makefile.in
index a67c4b91..8171138c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -856,7 +856,7 @@ stamps/build-qemu: $(QEMU_SRCDIR) $(QEMU_SRC_GIT)
 	mkdir -p $(dir $@)
 	date > $@
 
-stamps/build-dejagnu: $(srcdir)/riscv-dejagnu $(srcdir)/riscv-dejagnu/.git
+stamps/build-dejagnu: $(srcdir)/dejagnu $(srcdir)/dejagnu/.git
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)
 	cd $(notdir $@) && $</configure \
diff --git a/dejagnu b/dejagnu
new file mode 160000
index 00000000..d51e3f9f
--- /dev/null
+++ b/dejagnu
@@ -0,0 +1 @@
+Subproject commit d51e3f9f8188a735a64e7b2348e8fb7084f1d666
diff --git a/riscv-dejagnu b/riscv-dejagnu
deleted file mode 160000
index 4ea498a8..00000000
--- a/riscv-dejagnu
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4ea498a8e1fafeb568530d84db1880066478c86b