diff --git a/python/grass/script/core.py b/python/grass/script/core.py
index 8290a02b000..6b64326e88c 100644
--- a/python/grass/script/core.py
+++ b/python/grass/script/core.py
@@ -27,7 +27,7 @@
 import codecs
 import string
 import random
-import pipes
+import shlex
 from tempfile import NamedTemporaryFile
 
 from .utils import KeyValue, parse_key_val, basename, encode, decode, try_remove
@@ -863,7 +863,7 @@ def parser():
         sys.exit(1)
 
     cmdline = [basename(sys.argv[0])]
-    cmdline += [pipes.quote(a) for a in sys.argv[1:]]
+    cmdline += [shlex.quote(a) for a in sys.argv[1:]]
     os.environ["CMDLINE"] = " ".join(cmdline)
 
     argv = sys.argv[:]