diff --git a/command/flags/usage.go b/command/flags/usage.go
index 64b4061022..646665947b 100644
--- a/command/flags/usage.go
+++ b/command/flags/usage.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"strings"
 
-	text "github.com/tonnerre/golang-text"
+	text "github.com/kr/text"
 )
 
 func Usage(txt string, flags *flag.FlagSet) string {
diff --git a/vendor/github.com/tonnerre/golang-text/License b/vendor/github.com/kr/text/License
similarity index 100%
rename from vendor/github.com/tonnerre/golang-text/License
rename to vendor/github.com/kr/text/License
diff --git a/vendor/github.com/tonnerre/golang-text/Readme b/vendor/github.com/kr/text/Readme
similarity index 100%
rename from vendor/github.com/tonnerre/golang-text/Readme
rename to vendor/github.com/kr/text/Readme
diff --git a/vendor/github.com/tonnerre/golang-text/doc.go b/vendor/github.com/kr/text/doc.go
similarity index 100%
rename from vendor/github.com/tonnerre/golang-text/doc.go
rename to vendor/github.com/kr/text/doc.go
diff --git a/vendor/github.com/kr/text/go.mod b/vendor/github.com/kr/text/go.mod
new file mode 100644
index 0000000000..fa0528b9a9
--- /dev/null
+++ b/vendor/github.com/kr/text/go.mod
@@ -0,0 +1,3 @@
+module "github.com/kr/text"
+
+require "github.com/kr/pty" v1.1.1
diff --git a/vendor/github.com/tonnerre/golang-text/indent.go b/vendor/github.com/kr/text/indent.go
similarity index 100%
rename from vendor/github.com/tonnerre/golang-text/indent.go
rename to vendor/github.com/kr/text/indent.go
diff --git a/vendor/github.com/tonnerre/golang-text/wrap.go b/vendor/github.com/kr/text/wrap.go
old mode 100755
new mode 100644
similarity index 95%
rename from vendor/github.com/tonnerre/golang-text/wrap.go
rename to vendor/github.com/kr/text/wrap.go
index ca8856515c..b09bb03736
--- a/vendor/github.com/tonnerre/golang-text/wrap.go
+++ b/vendor/github.com/kr/text/wrap.go
@@ -31,7 +31,7 @@ func WrapBytes(b []byte, lim int) []byte {
 
 // WrapWords is the low-level line-breaking algorithm, useful if you need more
 // control over the details of the text wrapping process. For most uses, either
-// Wrap or WrapBytes will be sufficient and more convenient. 
+// Wrap or WrapBytes will be sufficient and more convenient.
 //
 // WrapWords splits a list of words into lines with minimal "raggedness",
 // treating each byte as one unit, accounting for spc units between adjacent
@@ -58,7 +58,7 @@ func WrapWords(words [][]byte, spc, lim, pen int) [][][]byte {
 		cost[i] = math.MaxInt32
 	}
 	for i := n - 1; i >= 0; i-- {
-		if length[i][n-1] <= lim {
+		if length[i][n-1] <= lim || i == n-1 {
 			cost[i] = 0
 			nbrk[i] = n
 		} else {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 74ab6d9a4c..df22267424 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -174,6 +174,7 @@
 		{"path":"github.com/keybase/go-crypto/openpgp/packet","checksumSHA1":"T7jstUu+oy2AVhZT/Md7R2lY8LM=","revision":"5114a9a81e1b256bfe283702d45dad50f8bf5ddf","revisionTime":"2018-06-14T16:04:07Z"},
 		{"path":"github.com/keybase/go-crypto/openpgp/s2k","checksumSHA1":"BGDxg1Xtsz0DSPzdQGJLLQqfYc8=","revision":"5114a9a81e1b256bfe283702d45dad50f8bf5ddf","revisionTime":"2018-06-14T16:04:07Z"},
 		{"path":"github.com/keybase/go-crypto/rsa","checksumSHA1":"rE3pp7b3gfcmBregzpIvN5IdFhY=","revision":"5114a9a81e1b256bfe283702d45dad50f8bf5ddf","revisionTime":"2018-06-14T16:04:07Z"},
+		{"path":"github.com/kr/text","checksumSHA1":"SbguDK5lY8uhaHNrmJmNbiWIGM0=","revision":"e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f","revisionTime":"2018-05-06T08:24:08Z"},
 		{"path":"github.com/lib/pq","checksumSHA1":"s6eyIXpJ7VAU06FM27GcEBM/5lo=","revision":"90697d60dd844d5ef6ff15135d0203f65d2f53b8","revisionTime":"2018-05-23T17:54:26Z"},
 		{"path":"github.com/lib/pq/oid","checksumSHA1":"AU3fA8Sm33Vj9PBoRPSeYfxLRuE=","revision":"90697d60dd844d5ef6ff15135d0203f65d2f53b8","revisionTime":"2018-05-23T17:54:26Z"},
 		{"path":"github.com/mattn/go-isatty","checksumSHA1":"xZuhljnmBysJPta/lMyYmJdujCg=","revision":"66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8","revisionTime":"2016-08-06T12:27:52Z"},
@@ -215,7 +216,6 @@
 		{"path":"github.com/stretchr/testify/assert","checksumSHA1":"6LwXZI7kXm1C0h4Ui0Y52p9uQhk=","revision":"c679ae2cc0cb27ec3293fea7e254e47386f05d69","revisionTime":"2018-03-14T08:05:35Z"},
 		{"path":"github.com/stretchr/testify/mock","checksumSHA1":"Qloi2PTvZv+D9FDHXM/banCoaFY=","revision":"c679ae2cc0cb27ec3293fea7e254e47386f05d69","revisionTime":"2018-03-14T08:05:35Z"},
 		{"path":"github.com/stretchr/testify/require","checksumSHA1":"KqYmXUcuGwsvBL6XVsQnXsFb3LI=","revision":"c679ae2cc0cb27ec3293fea7e254e47386f05d69","revisionTime":"2018-03-14T08:05:35Z"},
-		{"path":"github.com/tonnerre/golang-text","checksumSHA1":"t24KnvC9jRxiANVhpw2pqFpmEu8=","revision":"048ed3d792f7104850acbc8cfc01e5a6070f4c04","revisionTime":"2013-09-25T19:58:46Z"},
 		{"path":"github.com/vmware/govmomi","checksumSHA1":"3axQiX2sKB0pNGLIPwPqKIoZW90=","revision":"0627a5e7a9dc71f6e02b25f781a9b82f5985b084","revisionTime":"2018-07-14T17:07:08Z"},
 		{"path":"github.com/vmware/govmomi/find","checksumSHA1":"xFi1dbYQR8VwSRojdJMdvRGOmIw=","revision":"0627a5e7a9dc71f6e02b25f781a9b82f5985b084","revisionTime":"2018-07-14T17:07:08Z"},
 		{"path":"github.com/vmware/govmomi/list","checksumSHA1":"J3JrwZagGYMX6oNMkdsUFf8hHo8=","revision":"0627a5e7a9dc71f6e02b25f781a9b82f5985b084","revisionTime":"2018-07-14T17:07:08Z"},