diff --git a/tools/taco.cpp b/tools/taco.cpp
index 22005088c..7e2cd20f5 100644
--- a/tools/taco.cpp
+++ b/tools/taco.cpp
@@ -298,7 +298,13 @@ static void printCommandLine(ostream& os, int argc, char* argv[]) {
     os << " \"" << argv[1] << "\"";
   }
   for (int i = 2; i < argc; i++) {
-    os << " " << argv[i];
+    os << " ";
+    std::string arg = argv[i];
+    if (arg.rfind("-s=", 0) == 0) {
+      arg.replace(0, 3, "-s=\"");
+      arg += "\"";
+    }
+    os << arg;
   }
 }