diff --git a/Gopkg.lock b/Gopkg.lock
index c8894e97eb..ea5bcbd4af 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -384,13 +384,13 @@
   revision = "304308519d1355852f92cd88b31153c8a9a4e4db"
 
 [[projects]]
-  branch = "master"
-  digest = "1:6aef7435133a86356083388b3b64cffdfb5e6ba940515da60cfadd2ebc4c05de"
+  digest = "1:3bd786388cca2f0e8945a27ec836863f76762fd85da7e6da428c5a6801c6822d"
   name = "github.com/jessevdk/go-flags"
   packages = ["."]
   pruneopts = "UT"
-  revision = "c34bc0d561b850901c8b0a3be8ef3d69b666fd6b"
-  source = "github.com/XenoPhex/go-flags"
+  revision = "dac4e0ac4cd75079a03e408685a6140ef57a6aa3"
+  source = "github.com/nwmac/go-flags"
+  version = "1.1"
 
 [[projects]]
   digest = "1:1e15f4e455f94aeaedfcf9c75b3e1c449b5acba1551c58446b4b45be507c707b"
diff --git a/Gopkg.toml b/Gopkg.toml
index b452887c15..48c67300d5 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -25,6 +25,11 @@
   name = "github.com/moby/moby"
   revision = "9de84a78d76ed2ffe386fe21466f7401cf5d2e9d"
 
+[[override]]
+  name = "github.com/jessevdk/go-flags"
+  source = "github.com/nwmac/go-flags"
+  version = "=1.1"
+
 [prune]
   go-tests = true
   unused-packages = true