diff --git a/chain/chain.go b/chain/chain.go
index a37ac1d..57e67fe 100644
--- a/chain/chain.go
+++ b/chain/chain.go
@@ -25,9 +25,9 @@ import (
 	"github.com/btcsuite/btcrpcclient"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
+	"github.com/btcsuite/btcws"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
-	"github.com/conformal/btcws"
 )
 
 type Client struct {
diff --git a/rpcserver.go b/rpcserver.go
index 6d23f87..462c101 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -42,12 +42,12 @@ import (
 	"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"
-	"github.com/conformal/btcws"
 )
 
 // Error types to simplify the reporting of specific categories of