diff --git a/builder_client.go b/builder_client.go
index 5000782f81..0c283d2591 100644
--- a/builder_client.go
+++ b/builder_client.go
@@ -132,7 +132,12 @@ func (b builderClient) CmdEnv(args string) error {
 
 func (b builderClient) CmdCmd(args string) error {
 	b.needCommit = true
-	b.config.Cmd = []string{"/bin/sh", "-c", args}
+	var cmd []string
+	if err := json.Unmarshal([]byte(args), &cmd); err != nil {
+		b.config.Cmd = []string{"/bin/sh", "-c", args}
+	} else {
+		b.config.Cmd = cmd
+	}
 	return nil
 }