diff --git a/motioneye/meyectl.py b/motioneye/meyectl.py
index e9866b8d6..f682afa09 100755
--- a/motioneye/meyectl.py
+++ b/motioneye/meyectl.py
@@ -21,8 +21,8 @@
 import locale
 import logging
 import os.path
-import pipes
 import sys
+from shlex import quote
 
 import babel
 
@@ -91,7 +91,7 @@ def find_command(command):
         cmd = sys.executable + ' ' + cmd
         cmd = cmd.replace('-b', '')  # remove server-specific options
         cmd += ' %s ' % command
-        cmd += ' '.join([pipes.quote(arg) for arg in sys.argv[2:] if arg not in ['-b']])
+        cmd += ' '.join([quote(arg) for arg in sys.argv[2:] if arg not in ['-b']])
 
     return cmd