diff --git a/rpcserver.go b/rpcserver.go
index 462c101..36c8dda 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -38,13 +38,13 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcec"
+	"github.com/btcsuite/btcjson"
 	"github.com/btcsuite/btcrpcclient"
 	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/btcws"
 	"github.com/btcsuite/websocket"
-	"github.com/conformal/btcjson"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
diff --git a/txstore/json.go b/txstore/json.go
index 8ca350f..67629ff 100644
--- a/txstore/json.go
+++ b/txstore/json.go
@@ -18,10 +18,10 @@ package txstore
 
 import (
 	"github.com/btcsuite/btcchain"
+	"github.com/btcsuite/btcjson"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
-	"github.com/conformal/btcjson"
 )
 
 // ToJSON returns a slice of btcjson listtransactions result types for all credits
diff --git a/wallet.go b/wallet.go
index 2ce2caa..081a035 100644
--- a/wallet.go
+++ b/wallet.go
@@ -27,10 +27,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcchain"
+	"github.com/btcsuite/btcjson"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcjson"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"