diff --git a/_autocrossref.yaml b/_autocrossref.yaml
index 9b04f687..b338a1e5 100644
--- a/_autocrossref.yaml
+++ b/_autocrossref.yaml
@@ -181,6 +181,7 @@ BIP72:
 BIP111:
 BIP112:
 BIP113:
+BIP125:
 BIP130:
 BIP133:
 BIP141:
diff --git a/_data/glossary/en/cpfp.yaml b/_data/glossary/en/cpfp.yaml
new file mode 100644
index 00000000..e98514db
--- /dev/null
+++ b/_data/glossary/en/cpfp.yaml
@@ -0,0 +1,29 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+required:
+                                           #-------------40 characters-------------#
+    title_max_40_characters_no_formatting: Child Pays For Parent, CPFP
+
+    summary_max_255_characters_no_formatting: >
+        Selecting transactions for mining not just based on their fees but also
+        based on the fees of their ancestors (parents) and descendants
+        (children).
+
+    synonyms_shown_in_glossary_capitalize_first_letter:
+        - Child pays for parent
+        - CPFP
+        - Ancestor mining
+
+optional:
+    synonyms_and_pluralizations_not_shown_in_glossary:
+
+    not_to_be_confused_with_capitalize_first_letter:
+        - Replace by Fee
+        - RBF
+
+    links_html_or_markdown_style_capitalize_first_letter:
+        - "[More intelligent transaction selection for mining](https://bitcoincore.org/en/2016/08/23/release-0.13.0/#more-intelligent-transaction-selection-for-mining) --- Bitcoin Core 0.13.0 release (BitcoinCore.org)"
+
+---
diff --git a/_data/glossary/en/rbf.yaml b/_data/glossary/en/rbf.yaml
new file mode 100644
index 00000000..707c8d89
--- /dev/null
+++ b/_data/glossary/en/rbf.yaml
@@ -0,0 +1,39 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+required:
+                                           #-------------40 characters-------------#
+    title_max_40_characters_no_formatting: Replace-by-Fee, RBF
+
+    summary_max_255_characters_no_formatting: >
+        Replacing one version of an unconfirmed transaction with a
+        different version of the transaction that pays a higher
+        transaction fee.  May use BIP125 signaling.
+
+    synonyms_shown_in_glossary_capitalize_first_letter:
+        - Replace by fee
+        - RBF
+        - Opt-in replace by fee
+
+optional:
+    synonyms_and_pluralizations_not_shown_in_glossary:
+      - Replace-by-fee
+      - Full replace by fee
+      - Full RBF
+      - Replace by fee first seen safe
+      - Replace-by-fee first-seen-safe
+      - RBF FSS
+      - RBF-FSS
+      - "`bip125-replaceable`"
+
+    not_to_be_confused_with_capitalize_first_letter:
+        - Child pays for parent
+        - CPFP
+
+    links_html_or_markdown_style_capitalize_first_letter:
+        - "[BIP125: Opt-in Full Replace-by-Fee signaling](https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki) --- Bitcoin Improvement Proposals repository"
+        - "[Opt-in RBF FAQ](https://bitcoincore.org/en/faq/optin_rbf/) --- BitcoinCore.org"
+        - "[Transaction replacement](https://en.bitcoin.it/wiki/Transaction_replacement) --- Bitcoin Wiki"
+
+---
diff --git a/_includes/references.md b/_includes/references.md
index 056b8968..8dfa1902 100644
--- a/_includes/references.md
+++ b/_includes/references.md
@@ -332,6 +332,7 @@ http://opensource.org/licenses/MIT.
 [BIP111]: https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki
 [BIP112]: https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki
 [BIP113]: https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki
+[BIP125]: https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki
 [BIP130]: https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki
 [BIP133]: https://github.com/bitcoin/bips/blob/master/bip-0133.mediawiki
 [BIP141]: https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki