diff --git a/config.go b/config.go
index a2a5a935..8b85ae48 100644
--- a/config.go
+++ b/config.go
@@ -17,11 +17,11 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
+	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	_ "github.com/conformal/btcdb/memdb"
 	"github.com/conformal/btcwire"
-	flags "github.com/conformal/go-flags"
 	socks "github.com/conformal/go-socks"
 )
 
diff --git a/util/addblock/config.go b/util/addblock/config.go
index edebb7af..83a62386 100644
--- a/util/addblock/config.go
+++ b/util/addblock/config.go
@@ -10,11 +10,11 @@ import (
 	"path/filepath"
 
 	"github.com/btcsuite/btcutil"
+	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwire"
-	flags "github.com/conformal/go-flags"
 )
 
 const (
diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go
index f7112edb..8d9a8df0 100644
--- a/util/btcctl/btcctl.go
+++ b/util/btcctl/btcctl.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 
 	"github.com/btcsuite/btcutil"
+	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcws"
-	flags "github.com/conformal/go-flags"
 	"github.com/davecgh/go-spew/spew"
 )
 
diff --git a/util/btcctl/config.go b/util/btcctl/config.go
index 3504ab5b..0ba0b133 100644
--- a/util/btcctl/config.go
+++ b/util/btcctl/config.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/btcsuite/btcutil"
-	flags "github.com/conformal/go-flags"
+	flags "github.com/btcsuite/go-flags"
 )
 
 var (
diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go
index 179a0959..91fc05b1 100644
--- a/util/dropafter/dropafter.go
+++ b/util/dropafter/dropafter.go
@@ -12,12 +12,12 @@ import (
 	"strconv"
 
 	"github.com/btcsuite/btcutil"
+	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btclog"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwire"
-	flags "github.com/conformal/go-flags"
 )
 
 type ShaHash btcwire.ShaHash
diff --git a/util/findcheckpoint/config.go b/util/findcheckpoint/config.go
index 9d052090..f19de287 100644
--- a/util/findcheckpoint/config.go
+++ b/util/findcheckpoint/config.go
@@ -10,11 +10,11 @@ import (
 	"path/filepath"
 
 	"github.com/btcsuite/btcutil"
+	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwire"
-	flags "github.com/conformal/go-flags"
 )
 
 const (
diff --git a/util/gencerts/gencerts.go b/util/gencerts/gencerts.go
index ed03b749..06bf8dcc 100644
--- a/util/gencerts/gencerts.go
+++ b/util/gencerts/gencerts.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcutil"
-	flags "github.com/conformal/go-flags"
+	flags "github.com/btcsuite/go-flags"
 )
 
 type config struct {
diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go
index 955719bd..dec67a90 100644
--- a/util/showblock/showblock.go
+++ b/util/showblock/showblock.go
@@ -14,12 +14,12 @@ import (
 	"strconv"
 
 	"github.com/btcsuite/btcutil"
+	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	"github.com/conformal/btclog"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcwire"
-	flags "github.com/conformal/go-flags"
 	"github.com/davecgh/go-spew/spew"
 )