diff --git a/cmd/addblock/config.go b/cmd/addblock/config.go
index 970b034d..ae7a52fd 100644
--- a/cmd/addblock/config.go
+++ b/cmd/addblock/config.go
@@ -14,7 +14,7 @@ import (
 	_ "github.com/btcsuite/btcd/database/ffldb"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	flags "github.com/btcsuite/go-flags"
+	flags "github.com/jessevdk/go-flags"
 )
 
 const (
diff --git a/cmd/btcctl/config.go b/cmd/btcctl/config.go
index fbdb7790..d174cefe 100644
--- a/cmd/btcctl/config.go
+++ b/cmd/btcctl/config.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/btcsuite/btcd/btcjson"
 	"github.com/btcsuite/btcutil"
-	flags "github.com/btcsuite/go-flags"
+	flags "github.com/jessevdk/go-flags"
 )
 
 const (
diff --git a/cmd/findcheckpoint/config.go b/cmd/findcheckpoint/config.go
index bec25b30..1539db33 100644
--- a/cmd/findcheckpoint/config.go
+++ b/cmd/findcheckpoint/config.go
@@ -14,7 +14,7 @@ import (
 	_ "github.com/btcsuite/btcd/database/ffldb"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	flags "github.com/btcsuite/go-flags"
+	flags "github.com/jessevdk/go-flags"
 )
 
 const (
diff --git a/cmd/gencerts/gencerts.go b/cmd/gencerts/gencerts.go
index 959b264a..a3a50636 100644
--- a/cmd/gencerts/gencerts.go
+++ b/cmd/gencerts/gencerts.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
-	flags "github.com/btcsuite/go-flags"
+	flags "github.com/jessevdk/go-flags"
 )
 
 type config struct {
diff --git a/config.go b/config.go
index fe4fba81..c767ea67 100644
--- a/config.go
+++ b/config.go
@@ -26,8 +26,8 @@ import (
 	"github.com/btcsuite/btcd/mempool"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	flags "github.com/btcsuite/go-flags"
 	"github.com/btcsuite/go-socks/socks"
+	flags "github.com/jessevdk/go-flags"
 )
 
 const (
diff --git a/database/cmd/dbtool/main.go b/database/cmd/dbtool/main.go
index 04a16769..e6cfd62f 100644
--- a/database/cmd/dbtool/main.go
+++ b/database/cmd/dbtool/main.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/btcsuite/btcd/database"
 	"github.com/btcsuite/btclog"
-	flags "github.com/btcsuite/go-flags"
+	flags "github.com/jessevdk/go-flags"
 )
 
 const (
diff --git a/glide.lock b/glide.lock
index 8319cebe..133838f8 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,12 +1,12 @@
-hash: 8f89ba1940f8798b8a0449810532e3f0bc552ed97d907bc3447a8941a2ea3a4a
-updated: 2016-11-11T17:21:09.070085014-08:00
+hash: ebeea81fdd8ab49cce0e295ae834f8fbb0fb6e1b8e618a5059aceff477ef6596
+updated: 2016-12-09T12:53:49.172263045-05:00
 imports:
 - name: github.com/btcsuite/btclog
   version: 73889fb79bd687870312b6e40effcecffbd57d30
 - name: github.com/btcsuite/btcrpcclient
-  version: c6e1d711da0db56803309479a5deabb02b816e88
+  version: 7903290fd9956021ed7b65463f8667df345b365e
 - name: github.com/btcsuite/btcutil
-  version: aa9087a7efc961fbd253d4ae9c8b7a318749c273
+  version: 96e858f48ed95f9245e765d98be0ee01176409c7
   subpackages:
   - .
   - base58
@@ -14,8 +14,6 @@ imports:
   - hdkeychain
 - name: github.com/btcsuite/fastsha256
   version: 637e656429416087660c84436a2a035d69d54e2e
-- name: github.com/btcsuite/go-flags
-  version: 6c288d648c1cc1befcb90cb5511dcacf64ae8e61
 - name: github.com/btcsuite/go-socks
   version: cfe8b59e565c1a5bd4e2005d77cd9aa8b2e14524
   subpackages:
@@ -54,7 +52,9 @@ imports:
   - svc
   - winapi
 - name: github.com/davecgh/go-spew
-  version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
+  version: 346938d642f2ec3594ed81d874461961cd0faa76
   subpackages:
   - spew
+- name: github.com/jessevdk/go-flags
+  version: 1679536dcc895411a9f5848d9a0250be7856448c
 testImports: []
diff --git a/glide.yaml b/glide.yaml
index 69cfe0f8..adceeb8f 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -9,7 +9,6 @@ import:
   - hdkeychain
 - package: github.com/btcsuite/btcrpcclient
 - package: github.com/btcsuite/fastsha256
-- package: github.com/btcsuite/go-flags
 - package: github.com/btcsuite/go-socks
   subpackages:
   - socks
@@ -35,3 +34,5 @@ import:
 - package: github.com/davecgh/go-spew
   subpackages:
   - spew
+- package: github.com/jessevdk/go-flags
+  version: 1679536dcc895411a9f5848d9a0250be7856448c