diff --git a/address.go b/address.go
index 44d7896..0c7c494 100644
--- a/address.go
+++ b/address.go
@@ -10,9 +10,9 @@ import (
 
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil/base58"
-	"github.com/conformal/btcec"
 )
 
 var (
diff --git a/hdkeychain/extendedkey.go b/hdkeychain/extendedkey.go
index a8aeab4..da310ab 100644
--- a/hdkeychain/extendedkey.go
+++ b/hdkeychain/extendedkey.go
@@ -18,11 +18,11 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcec"
 )
 
 const (
diff --git a/internal_test.go b/internal_test.go
index 834ac18..016fb61 100644
--- a/internal_test.go
+++ b/internal_test.go
@@ -14,8 +14,8 @@ package btcutil
 import (
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcutil/base58"
-	"github.com/conformal/btcec"
 )
 
 // SetBlockBytes sets the internal serialized block byte buffer to the passed
diff --git a/wif.go b/wif.go
index c1770c9..c1119ff 100644
--- a/wif.go
+++ b/wif.go
@@ -8,10 +8,10 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil/base58"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcec"
 )
 
 // ErrMalformedPrivateKey describes an error where a WIF-encoded private
diff --git a/wif_test.go b/wif_test.go
index e417932..03584a4 100644
--- a/wif_test.go
+++ b/wif_test.go
@@ -7,9 +7,9 @@ package btcutil_test
 import (
 	"testing"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	. "github.com/btcsuite/btcutil"
-	"github.com/conformal/btcec"
 )
 
 func TestEncodeDecodeWIF(t *testing.T) {