diff --git a/blockmanager.go b/blockmanager.go
index 5eddc907..f2cc2c9b 100644
--- a/blockmanager.go
+++ b/blockmanager.go
@@ -13,11 +13,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
-	"github.com/conformal/btcnet"
 )
 
 const (
diff --git a/params.go b/params.go
index a44dda1c..0cc0b87b 100644
--- a/params.go
+++ b/params.go
@@ -5,8 +5,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcnet"
 )
 
 // activeNetParams is a pointer to the parameters specific to the
diff --git a/rpcserver.go b/rpcserver.go
index e575c0b0..f0fd45ce 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -26,6 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
@@ -34,7 +35,6 @@ import (
 	"github.com/conformal/btcdb"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcws"
 )
diff --git a/server.go b/server.go
index ad5ed314..8508183e 100644
--- a/server.go
+++ b/server.go
@@ -19,12 +19,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	"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"
-	"github.com/conformal/btcnet"
 )
 
 const (
diff --git a/util/addblock/config.go b/util/addblock/config.go
index b71a6ca4..21a1a7d9 100644
--- a/util/addblock/config.go
+++ b/util/addblock/config.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"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/conformal/btcnet"
 )
 
 const (
diff --git a/util/dropafter/dropafter.go b/util/dropafter/dropafter.go
index 2f235303..61acd718 100644
--- a/util/dropafter/dropafter.go
+++ b/util/dropafter/dropafter.go
@@ -12,12 +12,12 @@ import (
 	"strconv"
 
 	"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/conformal/btcnet"
 )
 
 type ShaHash btcwire.ShaHash
diff --git a/util/findcheckpoint/config.go b/util/findcheckpoint/config.go
index eca527ca..99c458d5 100644
--- a/util/findcheckpoint/config.go
+++ b/util/findcheckpoint/config.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"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/conformal/btcnet"
 )
 
 const (
diff --git a/util/findcheckpoint/findcheckpoint.go b/util/findcheckpoint/findcheckpoint.go
index 175f67aa..b7efe6e3 100644
--- a/util/findcheckpoint/findcheckpoint.go
+++ b/util/findcheckpoint/findcheckpoint.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcdb"
 	_ "github.com/conformal/btcdb/ldb"
-	"github.com/conformal/btcnet"
 )
 
 const blockDbNamePrefix = "blocks"
diff --git a/util/showblock/showblock.go b/util/showblock/showblock.go
index fc81f065..9a585534 100644
--- a/util/showblock/showblock.go
+++ b/util/showblock/showblock.go
@@ -14,12 +14,12 @@ import (
 	"strconv"
 
 	"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/conformal/btcnet"
 	"github.com/davecgh/go-spew/spew"
 )