diff --git a/btcec/go.mod b/btcec/go.mod
index 53e4a1f5cb..55485cabcc 100644
--- a/btcec/go.mod
+++ b/btcec/go.mod
@@ -3,7 +3,7 @@ module github.com/btcsuite/btcd/btcec/v2
 go 1.17
 
 require (
-	github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
 )
@@ -12,4 +12,5 @@ require github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
 
 // We depend on chainhash as is, so we need to replace to use the version of
 // chainhash included in the version of btcd we're building in.
-replace github.com/btcsuite/btcd => ../
+// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
+replace github.com/btcsuite/btcd/chaincfg/chainhash => ../chaincfg/chainhash
diff --git a/btcutil/go.mod b/btcutil/go.mod
index d3e460e53d..e6451e4e7a 100644
--- a/btcutil/go.mod
+++ b/btcutil/go.mod
@@ -5,13 +5,20 @@ go 1.16
 require (
 	github.com/aead/siphash v1.0.1
 	github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c
-	github.com/btcsuite/btcd/btcec/v2 v2.1.0
+	github.com/btcsuite/btcd/btcec/v2 v2.1.1
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
 	github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 )
 
+// TODO(guggero): Remove this as soon as we have a tagged version of btcec/v2.
 replace github.com/btcsuite/btcd/btcec/v2 => ../btcec
 
 replace github.com/btcsuite/btcd => ../
+
+// We depend on chainhash as is, so we need to replace to use the version of
+// chainhash included in the version of btcd we're building in.
+// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
+replace github.com/btcsuite/btcd/chaincfg/chainhash => ../chaincfg/chainhash
diff --git a/btcutil/psbt/go.mod b/btcutil/psbt/go.mod
index 3897bf9916..7ae2dcb86d 100644
--- a/btcutil/psbt/go.mod
+++ b/btcutil/psbt/go.mod
@@ -4,8 +4,9 @@ go 1.17
 
 require (
 	github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c
-	github.com/btcsuite/btcd/btcec/v2 v2.1.0
+	github.com/btcsuite/btcd/btcec/v2 v2.1.1
 	github.com/btcsuite/btcd/btcutil v1.1.0
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0
 	github.com/davecgh/go-spew v1.1.1
 )
 
@@ -15,8 +16,14 @@ require (
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
 )
 
+// TODO(guggero): Remove this as soon as we have a tagged version of btcec/v2.
 replace github.com/btcsuite/btcd/btcec/v2 => ../../btcec
 
 replace github.com/btcsuite/btcd/btcutil => ../
 
 replace github.com/btcsuite/btcd => ../..
+
+// We depend on chainhash as is, so we need to replace to use the version of
+// chainhash included in the version of btcd we're building in.
+// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
+replace github.com/btcsuite/btcd/chaincfg/chainhash => ../../chaincfg/chainhash
diff --git a/chaincfg/chainhash/go.mod b/chaincfg/chainhash/go.mod
new file mode 100644
index 0000000000..1d865254dd
--- /dev/null
+++ b/chaincfg/chainhash/go.mod
@@ -0,0 +1,3 @@
+module github.com/btcsuite/btcd/chaincfg/chainhash
+
+go 1.17
diff --git a/go.mod b/go.mod
index 7158ca2477..e56d76e3e0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,9 @@
 module github.com/btcsuite/btcd
 
 require (
-	github.com/btcsuite/btcd/btcec/v2 v2.1.0
+	github.com/btcsuite/btcd/btcec/v2 v2.1.1
 	github.com/btcsuite/btcd/btcutil v1.1.0
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd
 	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
@@ -24,8 +25,14 @@ require (
 
 replace github.com/btcsuite/btcd/btcutil => ./btcutil
 
+// TODO(guggero): Remove this as soon as we have a tagged version of btcec/v2.
 replace github.com/btcsuite/btcd/btcec/v2 => ./btcec
 
+// We depend on chainhash as is, so we need to replace to use the version of
+// chainhash included in the version of btcd we're building in.
+// TODO(guggero): Remove this as soon as we have a tagged version of chainhash.
+replace github.com/btcsuite/btcd/chaincfg/chainhash => ./chaincfg/chainhash
+
 // The retract statements below fixes an accidental push of the tags of a btcd
 // fork.
 retract (