diff --git a/zfs_autobackup/CmdPipe.py b/zfs_autobackup/CmdPipe.py
index fc64edb..f663e2e 100644
--- a/zfs_autobackup/CmdPipe.py
+++ b/zfs_autobackup/CmdPipe.py
@@ -43,7 +43,7 @@ class CmdPipe:
                 ret = ret + "(" + " ".join(item['cmd']) + ")"
             else:
                 #make it copy-pastable, will make a mess of quotes sometimes, but is correct
-                ret = ret + "(" + shlex.join(item['cmd']) + ")"
+                ret = ret + "(" + " ".join(map(shlex.quote,item['cmd'])) + ")"
 
         return ret
 
diff --git a/zfs_autobackup/ExecuteNode.py b/zfs_autobackup/ExecuteNode.py
index 3595465..49c6c4e 100644
--- a/zfs_autobackup/ExecuteNode.py
+++ b/zfs_autobackup/ExecuteNode.py
@@ -62,7 +62,7 @@ class ExecuteNode(LogStub):
 
             ret.append(self.ssh_to)
 
-        ret.append(shlex.join(cmd))
+        ret.append(" ".join(map(shlex.quote, cmd)))
 
         return ret