diff --git a/bin/h5cc.in b/bin/h5cc.in
index 9938c31f098..3e6f818ed60 100644
--- a/bin/h5cc.in
+++ b/bin/h5cc.in
@@ -263,6 +263,10 @@ for arg in $@ ; do
       qarg='"'"$arg"'"'
       qargs="$qargs $qarg"
       ;;
+    *\ *)
+      qarg=$arg
+      qargs="$qargs $qarg"
+      ;;
     *)
       if test -s "$arg"; then
         ext=`expr "$arg" : '.*\(\..*\)'`
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index 8830f3cd9a2..c031c9d69ca 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -253,6 +253,10 @@ for arg in $@ ; do
       qarg='"'"$arg"'"'
       qargs="$qargs $qarg"
       ;;
+    *\ *)
+      qarg=$arg
+      qargs="$qargs $qarg"
+      ;;
     *)
       if [ -s "$arg" ] ; then
 	ext=`expr "$arg" : '.*\(\..*\)'`
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index e0e35f5a1b8..562d56d2089 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -237,6 +237,10 @@ for arg in $@ ; do
       qarg='"'"$arg"'"'
       qargs="$qargs $qarg"
       ;;
+    *\ *)
+      qarg=$arg
+      qargs="$qargs $qarg"
+      ;;
     *)
       if [ -s "$arg" ] ; then
         ext=`expr "$arg" : '.*\(\..*\)'`