diff --git a/blockmanager.go b/blockmanager.go
index 913558bde..6306fa500 100644
--- a/blockmanager.go
+++ b/blockmanager.go
@@ -13,11 +13,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 )
 
 const (
diff --git a/cpuminer.go b/cpuminer.go
index 16cc84593..02fb7d513 100644
--- a/cpuminer.go
+++ b/cpuminer.go
@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 )
 
 const (
diff --git a/log.go b/log.go
index f46a41845..697b02c60 100644
--- a/log.go
+++ b/log.go
@@ -12,11 +12,11 @@ import (
 
 	"github.com/conformal/btcd/addrmgr"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/seelog"
-	"github.com/conformal/btcchain"
 	"github.com/conformal/btcscript"
 )
 
diff --git a/mempool.go b/mempool.go
index 501feb526..2253c2aa8 100644
--- a/mempool.go
+++ b/mempool.go
@@ -13,10 +13,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 	"github.com/conformal/btcscript"
 )
 
diff --git a/mempoolerror.go b/mempoolerror.go
index 9e7616f67..1f3c7c0a2 100644
--- a/mempoolerror.go
+++ b/mempoolerror.go
@@ -5,8 +5,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 )
 
 // RuleError identifies a rule violation.  It is used to indicate that
diff --git a/mining.go b/mining.go
index 1ca55a153..e01dd24c9 100644
--- a/mining.go
+++ b/mining.go
@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 	"github.com/conformal/btcscript"
 )
 
diff --git a/peer.go b/peer.go
index bbbb2ded0..0bcd950fb 100644
--- a/peer.go
+++ b/peer.go
@@ -16,12 +16,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"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/davecgh/go-spew/spew"
 )
diff --git a/rpcserver.go b/rpcserver.go
index 6959d2402..925caa74e 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -26,6 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
@@ -33,7 +34,6 @@ import (
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
-	"github.com/conformal/btcchain"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcws"
diff --git a/server.go b/server.go
index a6188783c..4e48f28bd 100644
--- a/server.go
+++ b/server.go
@@ -19,10 +19,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/addrmgr"
 	"github.com/conformal/btcjson"
 )
diff --git a/util/addblock/addblock.go b/util/addblock/addblock.go
index 9de039eac..310dcfcf7 100644
--- a/util/addblock/addblock.go
+++ b/util/addblock/addblock.go
@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btclog"
-	"github.com/conformal/btcchain"
 	"github.com/conformal/btcd/limits"
 )
 
diff --git a/util/addblock/import.go b/util/addblock/import.go
index 329fdb93b..62d908da3 100644
--- a/util/addblock/import.go
+++ b/util/addblock/import.go
@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 )
 
 var zeroHash = btcwire.ShaHash{}
diff --git a/util/findcheckpoint/findcheckpoint.go b/util/findcheckpoint/findcheckpoint.go
index 13132d899..c9b097af9 100644
--- a/util/findcheckpoint/findcheckpoint.go
+++ b/util/findcheckpoint/findcheckpoint.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	_ "github.com/btcsuite/btcdb/ldb"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcchain"
 )
 
 const blockDbNamePrefix = "blocks"