diff --git a/bin/h5cc.in b/bin/h5cc.in
index 737431b6882..cced614eca7 100644
--- a/bin/h5cc.in
+++ b/bin/h5cc.in
@@ -191,7 +191,7 @@ case "$CC" in
     ;;
 esac
 
-for arg in $@ ; do
+for arg in "$@" ; do
   if test "x$get_output_file" = "xyes"; then
     link_args="$link_args $arg"
     output_file="$arg"
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index 3ef6a3e0ae8..8b6492ed068 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -187,7 +187,7 @@ case "$CXX" in
     ;;
 esac
 
-for arg in $@ ; do
+for arg in "$@" ; do
   if test "x$get_output_file" = "xyes"; then
     link_args="$link_args $arg"
     output_file="$arg"
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index f63d2ff1cbd..7e2fa5fe1fb 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -165,7 +165,7 @@ if test "$#" = "0"; then
   usage
 fi
 
-for arg in $@ ; do
+for arg in "$@" ; do
   if test "x$get_output_file" = "xyes"; then
     link_args="$link_args $arg"
     output_file="$arg"