diff --git a/keystore/keystore.go b/keystore/keystore.go
index dafc62e..2a57807 100644
--- a/keystore/keystore.go
+++ b/keystore/keystore.go
@@ -36,10 +36,10 @@ import (
 
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcec"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/rename"
 )
diff --git a/keystore/keystore_test.go b/keystore/keystore_test.go
index e1cebac..6ca1576 100644
--- a/keystore/keystore_test.go
+++ b/keystore/keystore_test.go
@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcec"
 	"github.com/conformal/btcscript"
 
 	"github.com/davecgh/go-spew/spew"
diff --git a/rpcserver.go b/rpcserver.go
index c5e47f0..de19131 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -37,11 +37,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcrpcclient"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/websocket"
-	"github.com/conformal/btcec"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/chain"
diff --git a/waddrmgr/address.go b/waddrmgr/address.go
index d2c4e5a..0d4212b 100644
--- a/waddrmgr/address.go
+++ b/waddrmgr/address.go
@@ -22,9 +22,9 @@ import (
 	"math/big"
 	"sync"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/hdkeychain"
-	"github.com/conformal/btcec"
 )
 
 // zero sets all bytes in the passed slice to zero.  This is used to
diff --git a/waddrmgr/manager.go b/waddrmgr/manager.go
index 6675b9d..3969811 100644
--- a/waddrmgr/manager.go
+++ b/waddrmgr/manager.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcec"
 	"github.com/conformal/btcwallet/snacl"
 	"github.com/conformal/btcwallet/walletdb"
 )