diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index 9a21d42..e05dba5 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -449,6 +449,13 @@
 	popd
 fi
 
+SPM_REFSPEC="${spm_refspec:-$SPM_REFSPEC}"
+if not_upon "$no_spm"; then
+	# Clone SPM repository
+	url="$spm_src_repo_url" name="spm" ref="SPM_REFSPEC" \
+		loc="SPM_CHECKOUT_LOC" clone_and_sync
+fi
+
 CI_REFSPEC="${ci_refspec:-$CI_REFSPEC}"
 if not_upon "$no_ci"; then
 	# Clone Trusted Firmware CI repository
diff --git a/script/run_local_ci.sh b/script/run_local_ci.sh
index d5b661f..857355a 100755
--- a/script/run_local_ci.sh
+++ b/script/run_local_ci.sh
@@ -385,7 +385,7 @@
 fi
 
 # Use clone_repos.sh to clone and share repositories that aren't local.
-no_tf="$tf_root" no_tftf="$tftf_root" no_ci="$ci_root" no_cc="$import_cc" \
+no_tf="$tf_root" no_tftf="$tftf_root" no_spm="$spm_root" no_ci="$ci_root" no_cc="$import_cc" \
 	bash $minus_x "$ci_root/script/clone_repos.sh"
 
 set -a