diff --git a/tools/toolchain/install_cp2k_toolchain.sh b/tools/toolchain/install_cp2k_toolchain.sh
index 05d70a32d5..9ab0f0d759 100755
--- a/tools/toolchain/install_cp2k_toolchain.sh
+++ b/tools/toolchain/install_cp2k_toolchain.sh
@@ -326,7 +326,7 @@ if (command -v mpirun >&- 2>&-); then
     export MPI_MODE=mpich
   fi
 else
-  report_warning $LINENO "No MPI installation detected on your system. Ignore this message if you are using Cray Linux Environment"
+  report_warning $LINENO "No MPI installation detected (ignore this message in Cray Linux Environment or when MPI installation was requested)."
   export MPI_MODE=no
 fi
 
@@ -715,8 +715,15 @@ else
   fi
 fi
 
-# spglib and libvori require cmake.
-if [ "$with_spglib" = "__INSTALL__" ] || [ "$with_libvori" = "__INSTALL__" ]; then
+# several packages require cmake.
+if [ "$with_spglib" = "__INSTALL__" ] ||
+  [ "$with_libvori" = "__INSTALL__" ] ||
+  [ "$with_scalapack" = "__INSTALL__" ] ||
+  [ "$with_superlu" = "__INSTALL__" ] ||
+  [ "$with_sirius" = "__INSTALL__" ] ||
+  [ "$with_cosma" = "__INSTALL__" ] ||
+  [ "$with_spfft" = "__INSTALL__" ] ||
+  [ "$with_spla" = "__INSTALL__" ]; then
   [ "$with_cmake" = "__DONTUSE__" ] && with_cmake="__INSTALL__"
 fi
 
diff --git a/tools/toolchain/scripts/stage4/install_libxsmm.sh b/tools/toolchain/scripts/stage4/install_libxsmm.sh
index 11fde21f1b..f6b3b0cc74 100755
--- a/tools/toolchain/scripts/stage4/install_libxsmm.sh
+++ b/tools/toolchain/scripts/stage4/install_libxsmm.sh
@@ -28,7 +28,8 @@ cd "${BUILDDIR}"
 case "$with_libxsmm" in
   __INSTALL__)
     echo "==================== Installing Libxsmm ===================="
-    if [ "$OPENBLAS_ARCH" != "x86_64" ]; then
+    if [[ ("$OPENBLAS_ARCH" != "x86_64") && (\
+      "$OPENBLAS_ARCH" != "arm64" || "$libxsmm_ver" != "master") ]]; then
       report_warning $LINENO "libxsmm is not supported on arch ${OPENBLAS_ARCH}"
       cat << EOF > "${BUILDDIR}/setup_libxsmm"
 with_libxsmm="__DONTUSE__"