diff --git a/bin/hipcc b/bin/hipcc
index 55460fa8a3..20fc84d3e4 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -296,7 +296,7 @@ foreach $arg (@ARGV)
 
     if ($skipOutputFile) {
 	# TODO: handle filename with shell metacharacters
-        $toolArgs .= " $arg";
+        $toolArgs .= " \"$arg\"";
         $prevArg = $arg;
         $skipOutputFile = 0;
         next;