diff --git a/blockmanager.go b/blockmanager.go
index f2cc2c9b..913558bd 100644
--- a/blockmanager.go
+++ b/blockmanager.go
@@ -13,11 +13,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
 )
 
 const (
diff --git a/config.go b/config.go
index e9a2447e..b2edc41f 100644
--- a/config.go
+++ b/config.go
@@ -16,13 +16,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
+	_ "github.com/btcsuite/btcdb/memdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/btcsuite/go-socks/socks"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
-	_ "github.com/conformal/btcdb/memdb"
 )
 
 const (
diff --git a/log.go b/log.go
index ab524818..f46a4184 100644
--- a/log.go
+++ b/log.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/conformal/btcd/addrmgr"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/seelog"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
 )
 
diff --git a/mempool.go b/mempool.go
index 98eeac9a..501feb52 100644
--- a/mempool.go
+++ b/mempool.go
@@ -13,10 +13,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
 )
 
diff --git a/mining.go b/mining.go
index d13d0105..1ca55a15 100644
--- a/mining.go
+++ b/mining.go
@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
 	"github.com/conformal/btcscript"
 )
 
diff --git a/peer.go b/peer.go
index d6158e45..bbbb2ded 100644
--- a/peer.go
+++ b/peer.go
@@ -16,13 +16,13 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/bloom"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/go-socks/socks"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/addrmgr"
-	"github.com/conformal/btcdb"
 	"github.com/davecgh/go-spew/spew"
 )
 
diff --git a/rpcserver.go b/rpcserver.go
index 4430b441..6959d240 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -26,6 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
@@ -33,7 +34,6 @@ import (
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcws"
diff --git a/rpcwebsocket.go b/rpcwebsocket.go
index 7d3197a9..3e84ef20 100644
--- a/rpcwebsocket.go
+++ b/rpcwebsocket.go
@@ -19,11 +19,11 @@ import (
 
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
-	"github.com/conformal/btcdb"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcws"
diff --git a/server.go b/server.go
index 8508183e..a6188783 100644
--- a/server.go
+++ b/server.go
@@ -19,11 +19,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/addrmgr"
-	"github.com/conformal/btcdb"
 	"github.com/conformal/btcjson"
 )
 
diff --git a/util/addblock/addblock.go b/util/addblock/addblock.go
index d849e42a..9de039ea 100644
--- a/util/addblock/addblock.go
+++ b/util/addblock/addblock.go
@@ -9,11 +9,11 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btclog"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/limits"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 )
 
 const (
diff --git a/util/addblock/config.go b/util/addblock/config.go
index 21a1a7d9..ebb66797 100644
--- a/util/addblock/config.go
+++ b/util/addblock/config.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 )
 
 const (
diff --git a/util/addblock/import.go b/util/addblock/import.go
index 22f09197..329fdb93 100644
--- a/util/addblock/import.go
+++ b/util/addblock/import.go
@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 )
 
 var zeroHash = btcwire.ShaHash{}
diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go
index 61acd718..157b508f 100644
--- a/util/dropafter/dropafter.go
+++ b/util/dropafter/dropafter.go
@@ -11,13 +11,13 @@ import (
 	"path/filepath"
 	"strconv"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 )
 
 type ShaHash btcwire.ShaHash
diff --git a/util/findcheckpoint/config.go b/util/findcheckpoint/config.go
index 99c458d5..ae7c54b0 100644
--- a/util/findcheckpoint/config.go
+++ b/util/findcheckpoint/config.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 )
 
 const (
diff --git a/util/findcheckpoint/findcheckpoint.go b/util/findcheckpoint/findcheckpoint.go
index b7efe6e3..13132d89 100644
--- a/util/findcheckpoint/findcheckpoint.go
+++ b/util/findcheckpoint/findcheckpoint.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 )
 
 const blockDbNamePrefix = "blocks"
diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go
index 9a585534..e5b40564 100644
--- a/util/showblock/showblock.go
+++ b/util/showblock/showblock.go
@@ -13,13 +13,13 @@ import (
 	"path/filepath"
 	"strconv"
 
+	"github.com/btcsuite/btcdb"
+	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	flags "github.com/btcsuite/go-flags"
-	"github.com/conformal/btcdb"
-	_ "github.com/conformal/btcdb/ldb"
 	"github.com/davecgh/go-spew/spew"
 )