diff --git a/log.go b/log.go
index 697b02c6..1b3d1d1a 100644
--- a/log.go
+++ b/log.go
@@ -15,9 +15,9 @@ import (
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/seelog"
-	"github.com/conformal/btcscript"
 )
 
 const (
diff --git a/mempool.go b/mempool.go
index 2253c2aa..e046b7a4 100644
--- a/mempool.go
+++ b/mempool.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 )
 
 const (
diff --git a/mining.go b/mining.go
index e01dd24c..fcb45691 100644
--- a/mining.go
+++ b/mining.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcdb"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 )
 
 const (
diff --git a/rpcserver.go b/rpcserver.go
index 925caa74..41212b00 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -30,12 +30,12 @@ import (
 	"github.com/btcsuite/btcdb"
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcws"
 )
 
diff --git a/rpcwebsocket.go b/rpcwebsocket.go
index 3e84ef20..cfcebc32 100644
--- a/rpcwebsocket.go
+++ b/rpcwebsocket.go
@@ -20,12 +20,12 @@ import (
 	"golang.org/x/crypto/ripemd160"
 
 	"github.com/btcsuite/btcdb"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/fastsha256"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcws"
 )