diff --git a/contrib/rh-bkr/bkr.py b/contrib/rh-bkr/bkr.py
index c8436e8d12..5c6bb18288 100755
--- a/contrib/rh-bkr/bkr.py
+++ b/contrib/rh-bkr/bkr.py
@@ -545,8 +545,8 @@ class CmdSubmit(CmdBase):
             raise Exception("--nitrate-status or --nitrate-exclude-status makes only sense with selecting nitrate tags")
 
         self.subs['TESTS'] = ','.join(sorted(set(tests)))
-        self.subs['ARGV'] = ("\"" + "\" \"".join(sys.argv) + "\"") if sys.argv else ''
-        self.subs['ARGV_PROFILE'] = ("\"" + "\" \"".join(self.argv_profile) + "\"") if hasattr(self, 'argv_profile') else ''
+        self.subs['ARGV'] = ("\"" + "\" \"".join(sys.argv) + "\"").replace('"', '"') if sys.argv else ''
+        self.subs['ARGV_PROFILE'] = ("\"" + "\" \"".join(self.argv_profile) + "\"").replace('"', '"') if hasattr(self, 'argv_profile') else ''
 
         for (k,v) in self.subs.iteritems():
             self._print_substitution(k, v)