diff --git a/.gitmodules b/.gitmodules
index 17c9a4b4..d5e9ae73 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,7 +21,7 @@
 	url = https://github.com/riscv-boom/riscv-boom.git
 [submodule "generators/sifive-blocks"]
 	path = generators/sifive-blocks
-	url = https://github.com/abejgonzalez/sifive-blocks.git
+	url = https://github.com/sifive/sifive-blocks.git
 [submodule "generators/hwacha"]
 	path = generators/hwacha
 	url = https://github.com/ucb-bar/hwacha.git
diff --git a/generators/sifive-blocks b/generators/sifive-blocks
index 6cc6128b..545a396f 160000
--- a/generators/sifive-blocks
+++ b/generators/sifive-blocks
@@ -1 +1 @@
-Subproject commit 6cc6128b8aeab1f92d4ef55a0a06809a95eee730
+Subproject commit 545a396f3486132b01ceef3cbce2085608984478