diff --git a/scripts/build-toolchain-extra.sh b/scripts/build-toolchain-extra.sh
index f81ec135..54afe983 100755
--- a/scripts/build-toolchain-extra.sh
+++ b/scripts/build-toolchain-extra.sh
@@ -102,8 +102,12 @@ echo '==> Installing espresso logic minimizer'
 echo '==>  Installing libgloss'
 CC= CXX= SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv${XLEN}-unknown-elf" --host=riscv${XLEN}-unknown-elf
 
+cd $RDIR
 if [ $TOOLCHAIN == "riscv-tools" ]; then
     echo '==> Installing gemmini spike extensions'
+    git submodule update --init generators/gemmini
+    cd generators/gemmini
+    git submodule update --init software/libgemmini
     make -C $RDIR/generators/gemmini/software/libgemmini install
 fi