diff --git a/chainntfns.go b/chainntfns.go
index 05ee84e..c759ba4 100644
--- a/chainntfns.go
+++ b/chainntfns.go
@@ -17,8 +17,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
diff --git a/createtx.go b/createtx.go
index 7c95539..c9f7733 100644
--- a/createtx.go
+++ b/createtx.go
@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcchain"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 )
diff --git a/createtx_test.go b/createtx_test.go
index 65caf0b..707f731 100644
--- a/createtx_test.go
+++ b/createtx_test.go
@@ -6,9 +6,9 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 )
diff --git a/createtx_test_disabled.go b/createtx_test_disabled.go
index 061dbab..eceb2d3 100644
--- a/createtx_test_disabled.go
+++ b/createtx_test_disabled.go
@@ -12,9 +12,9 @@ package main
 import (
 	"testing"
 
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/tx"
 )
 
diff --git a/keystore/keystore.go b/keystore/keystore.go
index 2a57807..5e2a850 100644
--- a/keystore/keystore.go
+++ b/keystore/keystore.go
@@ -38,9 +38,9 @@ import (
 
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/rename"
 )
 
diff --git a/keystore/keystore_test.go b/keystore/keystore_test.go
index 6ca1576..60ee097 100644
--- a/keystore/keystore_test.go
+++ b/keystore/keystore_test.go
@@ -25,9 +25,9 @@ import (
 
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 
 	"github.com/davecgh/go-spew/spew"
 )
diff --git a/rpcserver.go b/rpcserver.go
index de19131..6d23f87 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -39,11 +39,11 @@ import (
 
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcrpcclient"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
diff --git a/txstore/json.go b/txstore/json.go
index ba71ab5..8ca350f 100644
--- a/txstore/json.go
+++ b/txstore/json.go
@@ -19,9 +19,9 @@ package txstore
 import (
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcscript"
 )
 
 // ToJSON returns a slice of btcjson listtransactions result types for all credits
diff --git a/txstore/tx.go b/txstore/tx.go
index b2d3852..0714a23 100644
--- a/txstore/tx.go
+++ b/txstore/tx.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 )
 
 var (
diff --git a/votingpool/pool.go b/votingpool/pool.go
index ecfa2c3..6ee3c61 100644
--- a/votingpool/pool.go
+++ b/votingpool/pool.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/hdkeychain"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"
 )