diff --git a/docs/xblock-tutorial/edx_platform/index.rst b/docs/xblock-tutorial/edx_platform/index.rst
index c57b5eb59..5b1eba954 100644
--- a/docs/xblock-tutorial/edx_platform/index.rst
+++ b/docs/xblock-tutorial/edx_platform/index.rst
@@ -11,3 +11,4 @@ XBlocks and the edX Platform
    edx_lms
    devstack
    edx
+   overrides
diff --git a/docs/xblock-tutorial/edx_platform/overrides.rst b/docs/xblock-tutorial/edx_platform/overrides.rst
new file mode 100644
index 000000000..2ada4d272
--- /dev/null
+++ b/docs/xblock-tutorial/edx_platform/overrides.rst
@@ -0,0 +1,75 @@
+.. _Replace a Preinstalled XBlock With a Custom Implementation:
+
+##########################################################
+Replace a Preinstalled XBlock With a Custom Implementation
+##########################################################
+
+In XBlock ``v5.1.0``, the ability was introduced to override an XBlock with a custom
+implementation.
+
+This can be done by:
+
+1. Creating an XBlock in a new or existing Django Plugin, installed into ``edx-platform``.
+
+2. Adding the ``xblock.v1.overrides`` entry point in ``setup.py``, pointing to your
+   custom XBlock.
+
+This works with updated logic in ``load_class``'s ``default_select``, which gives
+load priority to a class with the ``.overrides`` suffix.
+
+This can be disabled by providing a different ``select`` kwarg to ``load_class`` which
+ignores or otherwise changes override logic.
+
+*******
+Example
+*******
+
+Imagine there is an XBlock installed ``edx-platform``:
+
+.. code:: python
+
+    # edx-platform/xblocks/twitch_plays_pokemon.py
+    class TwitchPlaysPokemonBlock(XBlock):
+    ...
+
+    # edx-platform/setup.py
+    setup(
+        # ...
+
+        entry_points={
+            "xblock.v1": [
+                "tpp = xblocks.twitch_plays_pokemon::TwitchPlaysPokemonBlock"
+                # ...
+            ]
+        }
+    )
+
+If you then create your own Plugin App with a custom version of that XBlock...
+
+.. code:: python
+
+    # your_plugin/xblocks/twitch_plays_pokemon.py
+    class YourTwitchPlaysPokemonBlock(XBlock):
+    ...
+
+    # your_plugin/setup.py
+    setup(
+        # ...
+        entry_points={
+            "xblock.v1.overrides": [
+                "tpp = your_plugin.twitch_plays_pokemon::YourTwitchPlaysPokemonBlock"
+                # ...
+            ],
+        }
+    )
+
+And install that app as a Django plugin, then your block should be loaded instead of the
+existing implementation.
+
+.. note::
+
+    The ``load_class`` code will throw an error in the following cases:
+
+    1. There are multiple classes attempting to override one XBlock implementation.
+
+    2. There is an override provided where an existing XBlock implementation is not found.