diff --git a/extensions.go b/extensions.go
index 0c881a4fb..af8cd3e08 100644
--- a/extensions.go
+++ b/extensions.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
+	"github.com/btcsuite/btcws"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 )
 
 // FutureDebugLevelResult is a future promise to deliver the result of a
diff --git a/infrastructure.go b/infrastructure.go
index 31624281b..8dff70f5c 100644
--- a/infrastructure.go
+++ b/infrastructure.go
@@ -20,10 +20,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcws"
 	"github.com/btcsuite/go-socks/socks"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 )
 
 var (
diff --git a/notify.go b/notify.go
index d84f6ce34..b6f329cd2 100644
--- a/notify.go
+++ b/notify.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
+	"github.com/btcsuite/btcws"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 )
 
 var (
diff --git a/wallet.go b/wallet.go
index 44d472b47..40d4254d2 100644
--- a/wallet.go
+++ b/wallet.go
@@ -11,8 +11,8 @@ import (
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
+	"github.com/btcsuite/btcws"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 )
 
 // *****************************