diff --git a/CHANGELOG.md b/CHANGELOG.md
index 162b9efd4..2b2fb4696 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 BUG FIXES:
  * api: Search endpoint handles even UUID prefixes with hyphens [GH-3120]
+ * cli: All status commands handle even UUID prefixes with hyphens [GH-3122]
+ * cli: Fix autocompletion of paths that include directories on zsh [GH-3129] 
  * cli: Status command honors exact job match even when it is the prefix of
    another job [GH-3120]
- * cli: All status commands handle even UUID prefixes with hyphens [GH-3122]
  * cli: Fix setting of TLSServerName for node API Client. This fixes an issue of
    contacting nodes that are using TLS [GH-3127]
 
diff --git a/vendor/github.com/posener/complete/cmd/install/zsh.go b/vendor/github.com/posener/complete/cmd/install/zsh.go
index 9ece77998..a625f53cf 100644
--- a/vendor/github.com/posener/complete/cmd/install/zsh.go
+++ b/vendor/github.com/posener/complete/cmd/install/zsh.go
@@ -35,5 +35,5 @@ func (z zsh) Uninstall(cmd, bin string) error {
 }
 
 func (zsh) cmd(cmd, bin string) string {
-	return fmt.Sprintf("complete -C %s %s", bin, cmd)
+	return fmt.Sprintf("complete -o nospace -C %s %s", bin, cmd)
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 8518deb76..d306fb753 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -1113,26 +1113,26 @@
 		{
 			"checksumSHA1": "rTNABfFJ9wtLQRH8uYNkEZGQOrY=",
 			"path": "github.com/posener/complete",
-			"revision": "2100d1b06c06462a8a47bfc41a7f24a5d60a1420",
-			"revisionTime": "2017-08-25T06:44:15Z"
+			"revision": "9f41f7636a724791a3b8b1d35e84caa1124f0d3c",
+			"revisionTime": "2017-08-29T17:11:12Z"
 		},
 		{
 			"checksumSHA1": "NB7uVS0/BJDmNu68vPAlbrq4TME=",
 			"path": "github.com/posener/complete/cmd",
-			"revision": "e8d6fef54b6283f8bd3fbcb4a7de8884eb540293",
-			"revisionTime": "2017-05-27T17:24:47Z"
+			"revision": "9f41f7636a724791a3b8b1d35e84caa1124f0d3c",
+			"revisionTime": "2017-08-29T17:11:12Z"
 		},
 		{
-			"checksumSHA1": "kuS9vs+TMQzTGzXteL6EZ5HuKrU=",
+			"checksumSHA1": "gSX86Xl0w9hvtntdT8h23DZtSag=",
 			"path": "github.com/posener/complete/cmd/install",
-			"revision": "e8d6fef54b6283f8bd3fbcb4a7de8884eb540293",
-			"revisionTime": "2017-05-27T17:24:47Z"
+			"revision": "9f41f7636a724791a3b8b1d35e84caa1124f0d3c",
+			"revisionTime": "2017-08-29T17:11:12Z"
 		},
 		{
 			"checksumSHA1": "DMo94FwJAm9ZCYCiYdJU2+bh4no=",
 			"path": "github.com/posener/complete/match",
-			"revision": "e8d6fef54b6283f8bd3fbcb4a7de8884eb540293",
-			"revisionTime": "2017-05-27T17:24:47Z"
+			"revision": "9f41f7636a724791a3b8b1d35e84caa1124f0d3c",
+			"revisionTime": "2017-08-29T17:11:12Z"
 		},
 		{
 			"checksumSHA1": "M57Rrfc8Z966p+IBtQ91QOcUtcg=",