diff --git a/rpcserver.go b/rpcserver.go
index 41212b00..288d92db 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -33,10 +33,10 @@ import (
 	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
+	"github.com/btcsuite/btcws"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 )
 
 const (
diff --git a/rpcwebsocket.go b/rpcwebsocket.go
index cfcebc32..394b60cf 100644
--- a/rpcwebsocket.go
+++ b/rpcwebsocket.go
@@ -23,10 +23,10 @@ import (
 	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
+	"github.com/btcsuite/btcws"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 )
 
 const (
diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go
index 8d9a8df0..539a4ba6 100644
--- a/util/btcctl/btcctl.go
+++ b/util/btcctl/btcctl.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 
 	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcws"
 	flags "github.com/btcsuite/go-flags"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcws"
 	"github.com/davecgh/go-spew/spew"
 )