diff --git a/ch04_keys.adoc b/ch04_keys.adoc
index 39eb3bcd..3b0e3082 100644
--- a/ch04_keys.adoc
+++ b/ch04_keys.adoc
@@ -1159,7 +1159,7 @@ a segwit-based upgrade were ever to be ((("public key cryptography", "bech32 add
 
 ==== Bech32m
 
-Although bech32 worked well for segwit v0, developers didn't want to
+Although((("public key cryptography", "bech32 addresses", "bech32m", id="pub-key-bech32-bech32m")))((("bech32 addresses", "bech32m", id="bech32-bech32m")))((("bech32m addresses", id="bech32m"))) bech32 worked well for segwit v0, developers didn't want to
 unnecessarily constrain output sizes in later versions of segwit.
 Without constraints, adding or removing a single "q" in a bech32 address
 could result in a user accidentally sending their money to an
@@ -1418,7 +1418,7 @@ recommend that you use the test vectors provided in BIP350.  We also ask
 that you ensure your code passes the test vectors related to paying future segwit
 versions that haven't been defined yet.  This will help make your
 software usable for many years to come even if you aren't able to add
-support for new Bitcoin features as soon as they become available.
+support for new Bitcoin features as soon as they become ((("public key cryptography", "bech32 addresses", "bech32m", startref="pub-key-bech32-bech32m")))((("bech32 addresses", "bech32m", startref="bech32-bech32m")))((("bech32m addresses", startref="bech32m")))available.
 
 [[priv_formats]]
 ==== Private Key Formats