diff --git a/Gopkg.lock b/Gopkg.lock
index 2ef092f4981b..9b9d54c65347 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1020,18 +1020,17 @@
   version = "v1.0.0"
 
 [[projects]]
-  digest = "1:9c0eed728d7c6c3232a7b90505855517daa4a81697529bc509c3c10bea5d3ef1"
+  digest = "1:71425d83ffb201ca42fd0046860b2cae872c85e4c087c40271c04dea8c755434"
   name = "github.com/knz/go-libedit"
   packages = [
     ".",
     "common",
     "other",
     "unix",
-    "unix/sigtramp",
   ]
   pruneopts = "T"
-  revision = "0af72fd06d6f44cdb9666279d9b9a4d29cfa2da0"
-  version = "v1.9.1"
+  revision = "802af8e4ca87d39065a7df261d9f359ed7cf7b34"
+  version = "v1.10.1"
 
 [[projects]]
   branch = "master"
@@ -1899,6 +1898,7 @@
     "github.com/cockroachdb/errors",
     "github.com/cockroachdb/errors/assert",
     "github.com/cockroachdb/errors/errbase",
+    "github.com/cockroachdb/errors/errorspb",
     "github.com/cockroachdb/errors/issuelink",
     "github.com/cockroachdb/errors/markers",
     "github.com/cockroachdb/errors/testutils",
diff --git a/Gopkg.toml b/Gopkg.toml
index 456f6c329f89..ac57b020a83b 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -20,6 +20,12 @@ required = [
  "honnef.co/go/tools/cmd/staticcheck",
 ]
 
+noverify = [
+  # We generate Go code with cgo configuration flags into go-libedit in order
+   # to link against our own version of libedit.
+  "github.com/knz/go-libedit"
+]
+
 ignored = [
   # Non-existent package used by a toy program in c-deps/protobuf.
   "github.com/google/protobuf/examples/tutorial",
diff --git a/vendor b/vendor
index ee0a6a08be9b..500eebe2616a 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit ee0a6a08be9b64fba210e730dde64d7ef0a1b319
+Subproject commit 500eebe2616a8e74c8bde387ecba75069a6cfc84