diff --git a/common_test.go b/common_test.go
index a1b28b56..2322af64 100644
--- a/common_test.go
+++ b/common_test.go
@@ -15,11 +15,11 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
 	_ "github.com/conformal/btcdb/memdb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 var (
diff --git a/db.go b/db.go
index 57a4a097..9753efbb 100644
--- a/db.go
+++ b/db.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 
 	"github.com/btcsuite/btcutil"
-	"github.com/conformal/btcwire"
+	"github.com/btcsuite/btcwire"
 )
 
 // Errors that the various database functions may return.
diff --git a/interface_test.go b/interface_test.go
index 5c2663fb..5a365fb5 100644
--- a/interface_test.go
+++ b/interface_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
 )
 
diff --git a/ldb/block.go b/ldb/block.go
index ee0d1970..a5a9d640 100644
--- a/ldb/block.go
+++ b/ldb/block.go
@@ -9,9 +9,9 @@ import (
 	"encoding/binary"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/goleveldb/leveldb"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 // FetchBlockBySha - return a btcutil Block
diff --git a/ldb/boundary_test.go b/ldb/boundary_test.go
index f9ff23c6..523267ea 100644
--- a/ldb/boundary_test.go
+++ b/ldb/boundary_test.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 // we need to test for empty databas and make certain it returns proper value
diff --git a/ldb/dup_test.go b/ldb/dup_test.go
index 84d0452b..b3256602 100644
--- a/ldb/dup_test.go
+++ b/ldb/dup_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 func Test_dupTx(t *testing.T) {
diff --git a/ldb/insertremove_test.go b/ldb/insertremove_test.go
index c980fdd5..af83ba66 100644
--- a/ldb/insertremove_test.go
+++ b/ldb/insertremove_test.go
@@ -11,9 +11,9 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
-	"github.com/conformal/btcwire"
 )
 
 var tstBlocks []*btcutil.Block
diff --git a/ldb/internal_test.go b/ldb/internal_test.go
index a38bd644..8fe64ff1 100644
--- a/ldb/internal_test.go
+++ b/ldb/internal_test.go
@@ -7,8 +7,8 @@ package ldb
 import (
 	"fmt"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 // FetchSha returns the datablock and pver for the given ShaHash.
diff --git a/ldb/leveldb.go b/ldb/leveldb.go
index 1b59d274..20892c35 100644
--- a/ldb/leveldb.go
+++ b/ldb/leveldb.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/btcsuite/btclog"
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/goleveldb/leveldb"
 	"github.com/btcsuite/goleveldb/leveldb/opt"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 const (
diff --git a/ldb/operational_test.go b/ldb/operational_test.go
index 4e1659ea..fe8ce143 100644
--- a/ldb/operational_test.go
+++ b/ldb/operational_test.go
@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 var network = btcwire.MainNet
diff --git a/ldb/tx.go b/ldb/tx.go
index 00bd838d..afe06d57 100644
--- a/ldb/tx.go
+++ b/ldb/tx.go
@@ -8,9 +8,9 @@ import (
 	"bytes"
 	"encoding/binary"
 
+	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/goleveldb/leveldb"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 type txUpdateObj struct {
diff --git a/memdb/memdb.go b/memdb/memdb.go
index b339d34b..173c403d 100644
--- a/memdb/memdb.go
+++ b/memdb/memdb.go
@@ -11,8 +11,8 @@ import (
 	"sync"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcwire"
 )
 
 // Errors that the various database functions may return.
diff --git a/memdb/memdb_test.go b/memdb/memdb_test.go
index af3aa53a..9420b61e 100644
--- a/memdb/memdb_test.go
+++ b/memdb/memdb_test.go
@@ -9,10 +9,10 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcdb/memdb"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcwire"
 )
 
 // TestClosed ensure calling the interface functions on a closed database