diff --git a/address.go b/address.go
index b658e4a..1e82a7c 100644
--- a/address.go
+++ b/address.go
@@ -10,9 +10,9 @@ import (
 
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcutil/base58"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil/base58"
 )
 
 var (
diff --git a/address_test.go b/address_test.go
index 451316b..07b349a 100644
--- a/address_test.go
+++ b/address_test.go
@@ -13,8 +13,8 @@ import (
 
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/amount_test.go b/amount_test.go
index 7bc5e75..b6ab043 100644
--- a/amount_test.go
+++ b/amount_test.go
@@ -8,7 +8,7 @@ import (
 	"math"
 	"testing"
 
-	. "github.com/conformal/btcutil"
+	. "github.com/btcsuite/btcutil"
 )
 
 func TestAmountCreation(t *testing.T) {
diff --git a/appdata_test.go b/appdata_test.go
index 9845f93..d07d9d6 100644
--- a/appdata_test.go
+++ b/appdata_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 )
 
 // TestAppDataDir tests the API for AppDataDir to ensure it gives expected
diff --git a/base58/base58_test.go b/base58/base58_test.go
index 0356f1c..1d31ce9 100644
--- a/base58/base58_test.go
+++ b/base58/base58_test.go
@@ -9,7 +9,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/conformal/btcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 )
 
 var stringTests = []struct {
diff --git a/base58/base58bench_test.go b/base58/base58bench_test.go
index 6561b8f..f226e75 100644
--- a/base58/base58bench_test.go
+++ b/base58/base58bench_test.go
@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/conformal/btcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 )
 
 func BenchmarkBase58Encode(b *testing.B) {
diff --git a/base58/base58check_test.go b/base58/base58check_test.go
index ce32c4c..3217175 100644
--- a/base58/base58check_test.go
+++ b/base58/base58check_test.go
@@ -7,7 +7,7 @@ package base58_test
 import (
 	"testing"
 
-	"github.com/conformal/btcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 )
 
 var checkEncodingStringTests = []struct {
diff --git a/base58/example_test.go b/base58/example_test.go
index 823ed9d..8fadd6f 100644
--- a/base58/example_test.go
+++ b/base58/example_test.go
@@ -7,7 +7,7 @@ package base58_test
 import (
 	"fmt"
 
-	"github.com/conformal/btcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 )
 
 // This example demonstrates how to decode modified base58 encoded data.
diff --git a/block_test.go b/block_test.go
index 64dfe3a..51c40c3 100644
--- a/block_test.go
+++ b/block_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
 )
diff --git a/bloom/example_test.go b/bloom/example_test.go
index f01c142..0b8f836 100644
--- a/bloom/example_test.go
+++ b/bloom/example_test.go
@@ -9,7 +9,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/conformal/btcutil/bloom"
+	"github.com/btcsuite/btcutil/bloom"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/bloom/filter.go b/bloom/filter.go
index 10a08ea..5871bc1 100644
--- a/bloom/filter.go
+++ b/bloom/filter.go
@@ -9,8 +9,8 @@ import (
 	"math"
 	"sync"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/bloom/filter_test.go b/bloom/filter_test.go
index 59e2a58..34ffc51 100644
--- a/bloom/filter_test.go
+++ b/bloom/filter_test.go
@@ -9,8 +9,8 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/bloom"
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/bloom"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/bloom/merkleblock.go b/bloom/merkleblock.go
index 7432248..e248ccc 100644
--- a/bloom/merkleblock.go
+++ b/bloom/merkleblock.go
@@ -5,8 +5,8 @@
 package bloom
 
 import (
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcchain"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/bloom/merkleblock_test.go b/bloom/merkleblock_test.go
index fbb529e..8342c6a 100644
--- a/bloom/merkleblock_test.go
+++ b/bloom/merkleblock_test.go
@@ -9,8 +9,8 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/bloom"
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/bloom"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/bloom/murmurhash3_test.go b/bloom/murmurhash3_test.go
index fd0eaf0..38362e4 100644
--- a/bloom/murmurhash3_test.go
+++ b/bloom/murmurhash3_test.go
@@ -7,7 +7,7 @@ package bloom_test
 import (
 	"testing"
 
-	"github.com/conformal/btcutil/bloom"
+	"github.com/btcsuite/btcutil/bloom"
 )
 
 // TestMurmurHash3 ensure the MurmurHash3 function produces the correct hash
diff --git a/certgen_test.go b/certgen_test.go
index 4a9051c..ba292fc 100644
--- a/certgen_test.go
+++ b/certgen_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	//"github.com/davecgh/go-spew/spew"
 )
 
diff --git a/coinset/coins.go b/coinset/coins.go
index 227ea6d..854555c 100644
--- a/coinset/coins.go
+++ b/coinset/coins.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"sort"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/coinset/coins_test.go b/coinset/coins_test.go
index 4f01ac5..f243179 100644
--- a/coinset/coins_test.go
+++ b/coinset/coins_test.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/coinset"
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/coinset"
 	"github.com/conformal/btcwire"
 	"github.com/conformal/fastsha256"
 )
diff --git a/hdkeychain/bench_test.go b/hdkeychain/bench_test.go
index 521818a..0cebdf5 100644
--- a/hdkeychain/bench_test.go
+++ b/hdkeychain/bench_test.go
@@ -7,7 +7,7 @@ package hdkeychain_test
 import (
 	"testing"
 
-	"github.com/conformal/btcutil/hdkeychain"
+	"github.com/btcsuite/btcutil/hdkeychain"
 )
 
 // bip0032MasterPriv1 is the master private extended key from the first set of
diff --git a/hdkeychain/example_test.go b/hdkeychain/example_test.go
index 44c27af..07a18f5 100644
--- a/hdkeychain/example_test.go
+++ b/hdkeychain/example_test.go
@@ -7,8 +7,8 @@ package hdkeychain_test
 import (
 	"fmt"
 
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil/hdkeychain"
 )
 
 // This example demonstrates how to generate a cryptographically random seed
diff --git a/hdkeychain/extendedkey.go b/hdkeychain/extendedkey.go
index d9ff8ce..d1b3929 100644
--- a/hdkeychain/extendedkey.go
+++ b/hdkeychain/extendedkey.go
@@ -18,10 +18,10 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/base58"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/base58"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/hdkeychain/extendedkey_test.go b/hdkeychain/extendedkey_test.go
index d106bb5..14d1c72 100644
--- a/hdkeychain/extendedkey_test.go
+++ b/hdkeychain/extendedkey_test.go
@@ -15,8 +15,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil/hdkeychain"
 )
 
 // TestBIP0032Vectors tests the vectors provided by [BIP32] to ensure the
diff --git a/internal_test.go b/internal_test.go
index b6f6903..834ac18 100644
--- a/internal_test.go
+++ b/internal_test.go
@@ -14,8 +14,8 @@ package btcutil
 import (
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcutil/base58"
 	"github.com/conformal/btcec"
-	"github.com/conformal/btcutil/base58"
 )
 
 // SetBlockBytes sets the internal serialized block byte buffer to the passed
diff --git a/tx_test.go b/tx_test.go
index 3681ae0..a8b83d2 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
 )
diff --git a/wif.go b/wif.go
index 5fbf131..73353df 100644
--- a/wif.go
+++ b/wif.go
@@ -8,9 +8,9 @@ import (
 	"bytes"
 	"errors"
 
+	"github.com/btcsuite/btcutil/base58"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil/base58"
 	"github.com/conformal/btcwire"
 )
 
diff --git a/wif_test.go b/wif_test.go
index f7c0127..04a7c7e 100644
--- a/wif_test.go
+++ b/wif_test.go
@@ -7,9 +7,9 @@ package btcutil_test
 import (
 	"testing"
 
+	. "github.com/btcsuite/btcutil"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
-	. "github.com/conformal/btcutil"
 )
 
 func TestEncodeDecodeWIF(t *testing.T) {