diff --git a/tests/lint b/tests/lint
index ce9d405..d00bfc4 100755
--- a/tests/lint
+++ b/tests/lint
@@ -66,6 +66,7 @@ run_shellcheck \
     resources/scripts/tasks/distclean.sh \
     tests/distclean \
     tests/lint \
+    website-build/build.sh \
     website-build/check.sh
 
 printf "+---------------------+\n"
diff --git a/website-build/build.sh b/website-build/build.sh
index 1dc16ee..77e332b 100755
--- a/website-build/build.sh
+++ b/website-build/build.sh
@@ -50,7 +50,7 @@ sync_repo()
 		git clone "${src_uri}" "${dst_path}"
 		git -C "${dst_path}" checkout "${src_revision}"
 	elif [ ! -d "${dst_path}" ] ; then
-		mkdir -p "$(dirname ${dst_path})"
+		mkdir -p "$(dirname "${dst_path}")"
 		cp -a "${src_path}" "${dst_path}"
 		if [ -n "${src_revision}" ] ; then
 			git -C "${dst_path}" checkout "${src_revision}"
@@ -79,7 +79,7 @@ sync_repo()
 		for patch in ${src_patches} ; do
 			GIT_COMMITTER_EMAIL="noreply@gnuboot.gnu.org" \
 			GIT_COMMITTER_NAME="website-build" \
-			git -C "${dst_path}" am $(realpath ${patch})
+			git -C "${dst_path}" am "$(realpath "${patch}")"
 		done
 	else
 		rm -rf "${dst_path}"
@@ -124,8 +124,8 @@ while [ "$i" -le $# ] ; do
 				help_missing_arg "--with-untitled-path"
 				exit ${EX_USAGE}
 			fi
-			untitled_path="$(eval echo \$$(expr $i + 1))"
-			i="$(expr "$i" + 1)"
+			untitled_path="$(eval echo \$$((i + 1)))"
+			i="$((i + 1))"
 			;;
 		*)
 			help
@@ -133,7 +133,7 @@ while [ "$i" -le $# ] ; do
 			;;
 	esac
 
-	i="$(expr "$i" + 1)"
+	i="$((i + 1))"
 done
 
 set -e