diff --git a/.gitmodules b/.gitmodules
index ca80d661..55e8a98b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "tools/firrtl"]
 	path = tools/firrtl
 	url = https://github.com/freechipsproject/firrtl
-[submodule "riscv-tools"]
-	path = toolchains/riscv-tools
-	url = https://github.com/riscv/riscv-tools.git
 [submodule "esp-tools"]
 	path = toolchains/esp-tools
 	url = https://github.com/ucb-bar/esp-tools.git
@@ -40,3 +37,6 @@
 [submodule "generators/block-inclusivecache-sifive"]
 	path = generators/sifive-cache
 	url = https://github.com/sifive/block-inclusivecache-sifive.git
+[submodule "toolchains/riscv-tools"]
+	path = toolchains/riscv-tools
+	url = https://github.com/freechipsproject/rocket-tools.git
diff --git a/toolchains/riscv-tools b/toolchains/riscv-tools
index bce7b5e3..190bb6ba 160000
--- a/toolchains/riscv-tools
+++ b/toolchains/riscv-tools
@@ -1 +1 @@
-Subproject commit bce7b5e363957c134f944769e677354467b7e4ed
+Subproject commit 190bb6badf53673f29611796fa29a8ba7a37f002