diff --git a/extensions.go b/extensions.go
index 4a65d27be..a823a0df7 100644
--- a/extensions.go
+++ b/extensions.go
@@ -10,9 +10,9 @@ import (
 	"fmt"
 
 	"github.com/btcsuite/btcd/btcjson"
+	"github.com/btcsuite/btcd/btcjson/btcws"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	"github.com/btcsuite/btcws"
 )
 
 // FutureDebugLevelResult is a future promise to deliver the result of a
diff --git a/infrastructure.go b/infrastructure.go
index 1af40a0b3..383143c34 100644
--- a/infrastructure.go
+++ b/infrastructure.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcjson"
-	"github.com/btcsuite/btcws"
+	"github.com/btcsuite/btcd/btcjson/btcws"
 	"github.com/btcsuite/go-socks/socks"
 	"github.com/btcsuite/websocket"
 )
diff --git a/notify.go b/notify.go
index 65608e5cd..44c556e60 100644
--- a/notify.go
+++ b/notify.go
@@ -14,9 +14,9 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcjson"
+	"github.com/btcsuite/btcd/btcjson/btcws"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	"github.com/btcsuite/btcws"
 )
 
 var (
diff --git a/wallet.go b/wallet.go
index 08bd0f12b..4542819aa 100644
--- a/wallet.go
+++ b/wallet.go
@@ -9,10 +9,10 @@ import (
 	"strconv"
 
 	"github.com/btcsuite/btcd/btcjson"
+	"github.com/btcsuite/btcd/btcjson/btcws"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	"github.com/btcsuite/btcws"
 )
 
 // *****************************