diff --git a/_data/toc/how-do-i.yml b/_data/toc/how-do-i.yml
index 25f02ed26a4..66da7a4d15f 100644
--- a/_data/toc/how-do-i.yml
+++ b/_data/toc/how-do-i.yml
@@ -6,6 +6,10 @@ pages:
     - label: Contributor sign-up sheet
       url: howdoi/howdoi_contribute.html
 
+    - label: Create a GitHub patch for a Composer installation
+      versions: ["2.1","2.2", "2.3"]
+      url: /howdoi/patch_from_github.html
+
     - label: Configure Magento
       url: howdoi/config/configure.html
 
diff --git a/guides/v2.1/howdoi/patch_from_github.md b/guides/v2.1/howdoi/patch_from_github.md
new file mode 100644
index 00000000000..814c2ee1b68
--- /dev/null
+++ b/guides/v2.1/howdoi/patch_from_github.md
@@ -0,0 +1,103 @@
+---
+layout: default
+group: howdoi
+title: Create a GitHub patch for a Composer installation
+version: 2.2
+github_link: howdoi/patch_from_github.md
+functional_areas:
+  - Install
+  - System
+  - Setup
+---
+
+Sometimes it takes a while for us to include a bug fix made on GitHub in a Magento 2 Composer release. In the meantime, you can create a patch from GitHub and use the [`cweagans/composer-patches`](https://github.com/cweagans/composer-patches/){:target="\_blank"} plugin to apply it to your Composer-based Magento 2 installation.
+
+<div class="bs-callout bs-callout-warning" markdown="1">
+Always perform comprehensive testing before deploying any unreleased patch.
+</div>
+
+## Create a patch
+
+There are many ways to create patch files. This example focuses on creating a patch from a known commit.
+
+To create a patch file:
+
+1. Create a `patches/composer` directory in your local project.
+
+1. Identify the GitHub commit or pull request to use for the patch. This example uses the [`2d31571`](https://github.com/magento/magento2/commit/2d31571f1bacd11aa2ec795180abf682e0e9aede){:target="\_blank"} commit linked to Magento 2 GitHub issue [#6474](https://github.com/magento/magento2/issues/6474){:target="\_blank"}.
+
+1. Append `.patch` or `.diff` to the commit URL. Use `.diff` for a smaller file size. For example:
+
+   [https://github.com/magento/magento2/commit/2d31571f1bacd11aa2ec795180abf682e0e9aede.diff](https://github.com/magento/magento2/commit/2d31571f1bacd11aa2ec795180abf682e0e9aede.diff){:target="\_blank"}
+
+1. Save the page as a file in the `patches/composer` directory. For example, `github-issue-6474.diff`.
+
+1. Edit the file and remove `vendor/<VENDOR>/<PACKAGE>` from all paths so that they are relative to the `vendor/<VENDOR>/<PACKAGE>` directory.
+
+    The following example shows the previously mentioned diff file after removing all instances of `app/code/Magento/Payment`:
+
+    ```text
+    diff --git a/view/frontend/web/js/view/payment/iframe.js b/view/frontend/web/js/view/payment/iframe.js
+    index c8a6fef58d31..7d01c195791e 100644
+    --- a/view/frontend/web/js/view/payment/iframe.js
+    +++ b/view/frontend/web/js/view/payment/iframe.js
+    @@ -154,6 +154,7 @@ define(
+                  */
+                 clearTimeout: function () {
+                     clearTimeout(this.timeoutId);
+    +                this.fail();
+
+                     return this;
+                 },
+    ```
+
+    <div class="bs-callout bs-callout-warning" markdown="1">
+    Text editors that automatically remove trailing whitespace or add new lines can break the patch. Use a simple text editor to make these changes.
+    </div>
+
+## Apply a patch
+
+To apply a patch:
+
+1. Open a terminal and navigate to your project directory.
+
+1. Add the `cweagans/composer-patches` plugin to the `composer.json` file.
+
+   ```bash
+   composer require cweagans/composer-patches
+   ```
+
+1. Edit the `composer.json` file and add the following section to specify:
+
+    - **Module**: _"magento/module-payment"_
+    - **Title**: _"MAGETWO-56934: Checkout page freezes when ordering with Authorize.net with invalid credit card"_
+    - **Path to patch**: _"patches/composer/github-issue-6474.diff"_
+
+    For example:
+
+    ```json
+    "extra": {
+        "composer-exit-on-patch-failure": true,
+        "patches": {
+            "magento/module-payment": {
+                "MAGETWO-56934: Checkout page freezes when ordering with Authorize.net with invalid credit card": "patches/composer/github-issue-6474.diff"
+            }
+        }
+    }
+    ```
+
+    <div class="bs-callout bs-callout-info" markdown="1">
+    If a patch affects multiple modules, you must create multiple patch files targeting multiple modules.
+    </div>
+
+1. Apply the patch. Use the `-v` option only if you want to see debugging information.
+
+   ```bash
+   composer -v install
+   ```
+
+1. Update the `composer.lock` file. The lock file tracks which patches have been applied to each Composer package in an `extra > patches_applied` object.
+
+   ```bash
+   composer update --lock
+   ```
diff --git a/guides/v2.2/howdoi/patch_from_github.md b/guides/v2.2/howdoi/patch_from_github.md
new file mode 120000
index 00000000000..26bdfa848c2
--- /dev/null
+++ b/guides/v2.2/howdoi/patch_from_github.md
@@ -0,0 +1 @@
+../../v2.1/howdoi/patch_from_github.md
\ No newline at end of file
diff --git a/guides/v2.3/howdoi/patch_from_github.md b/guides/v2.3/howdoi/patch_from_github.md
new file mode 120000
index 00000000000..4c3cd36c636
--- /dev/null
+++ b/guides/v2.3/howdoi/patch_from_github.md
@@ -0,0 +1 @@
+../../v2.2/howdoi/patch_from_github.md
\ No newline at end of file