diff --git a/bin/hipcc b/bin/hipcc
index 1ed5ac6736..79db36703f 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -678,7 +678,9 @@ foreach $arg (@ARGV)
     # common characters such as alphanumerics.
     # Do the quoting here because sometimes the $arg is changed in the loop
     # Important to have all of '-Xlinker' in the set of unquoted characters.
-    $arg =~ s/[^-a-zA-Z0-9=+,.]/\\$&/g;
+    if (not $isWindows) {       # Windows needs different quoting, ignore for now
+        $arg =~ s/[^-a-zA-Z0-9_=+,.\/]/\\$&/g;
+    }
     $toolArgs .= " $arg" unless $swallowArg;
     $prevArg = $arg;
 }