diff --git a/.gitmodules b/.gitmodules
index 69ce8245..17c9a4b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -133,4 +133,4 @@
 	url = https://github.com/ucb-bar/riscv-sodor.git
 [submodule "fpga/fpga-shells"]
 	path = fpga/fpga-shells
-	url = https://github.com/abejgonzalez/fpga-shells.git
+	url = https://github.com/sifive/fpga-shells.git
diff --git a/fpga/fpga-shells b/fpga/fpga-shells
index fcfadb4c..f9fb9fd3 160000
--- a/fpga/fpga-shells
+++ b/fpga/fpga-shells
@@ -1 +1 @@
-Subproject commit fcfadb4cf36dfbcd7cfee525404b56bf661793b9
+Subproject commit f9fb9fd338e5fca2ff5116b1d01506c424280d70