diff --git a/rpcserver.go b/rpcserver.go
index 288d92db..cb8e20d4 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -29,6 +29,7 @@ import (
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcec"
+	"github.com/btcsuite/btcjson"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
@@ -36,7 +37,6 @@ import (
 	"github.com/btcsuite/btcws"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
-	"github.com/conformal/btcjson"
 )
 
 const (
diff --git a/rpcwebsocket.go b/rpcwebsocket.go
index 394b60cf..24df9028 100644
--- a/rpcwebsocket.go
+++ b/rpcwebsocket.go
@@ -20,13 +20,13 @@ import (
 	"golang.org/x/crypto/ripemd160"
 
 	"github.com/btcsuite/btcdb"
+	"github.com/btcsuite/btcjson"
 	"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"
 )
 
 const (
diff --git a/server.go b/server.go
index 4e48f28b..5080aab7 100644
--- a/server.go
+++ b/server.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
+	"github.com/btcsuite/btcjson"
 	"github.com/btcsuite/btcnet"
 	"github.com/btcsuite/btcwire"
 	"github.com/conformal/btcd/addrmgr"
-	"github.com/conformal/btcjson"
 )
 
 const (
diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go
index 539a4ba6..dbf2b91b 100644
--- a/util/btcctl/btcctl.go
+++ b/util/btcctl/btcctl.go
@@ -10,10 +10,10 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/btcsuite/btcjson"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcws"
 	flags "github.com/btcsuite/go-flags"
-	"github.com/conformal/btcjson"
 	"github.com/davecgh/go-spew/spew"
 )