diff --git a/docs/cli/built-in-commands/make-addon.md b/docs/cli/built-in-commands/make-addon.md
deleted file mode 100644
index 9a57fa9a7..000000000
--- a/docs/cli/built-in-commands/make-addon.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# make:addon
-
-Addon Generator -- Creates a new add-on
-
-Check out our video tutorial generating an add-on!
-<div class="video-wrapper">
-<iframe src="https://www.youtube.com/embed/I5rZ322RSJk?vq=HD1080" width="1920" height="1080" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-</div>
-
-## Options list:
-
-```
-    --extension
-    --ext
-        Create an extension
-
-    --plugin
-    --pi
-        Create a plugin
-
-    --fieldtype
-    --ft
-        Create a fieldtype
-
-    --module
-    --mod
-        Create a module
-
-    --typography
-    -t
-        Should use plugin typography
-
-    --has-settings=<value>
-    -e <value>
-        Add-on has settings (yes/no)
-
-    --compatibility-mode
-    -p
-        Generate add-on that is compatible with ExpressionEngine versions lower than 7.2.0 and lower than 6.4.0
-
-    --version=<value>
-    -v <value>
-        Version of the add-on
-
-    --description=<value>
-    -d <value>
-        Description of the add-on
-
-    --author=<value>
-    -a <value>
-        Author of the add-on
-
-    --author-url=<value>
-    -u <value>
-        Author url of the add-on
-
-    --services=<value> [--services=<value> [...]]
-    -s <value> [-s <value> [...]]
-        Services to create. Multi-pass option.
-
-    --models=<value> [--models=<value> [...]]
-    -m <value> [-m <value> [...]]
-        Models to create. Multi-pass option.
-
-    --commands=<value> [--commands=<value> [...]]
-    -c <value> [-c <value> [...]]
-        Commands to create. Multi-pass option.
-
-    --consents=<value> [--consents=<value> [...]]
-    -n <value> [-n <value> [...]]
-        Consents. Multi-pass option.
-
-    --cookies=<value> [--cookies=<value> [...]]
-    -k <value> [-k <value> [...]]
-        Cookies to create, with a colon separating name and value (i.e. name:value). Multi-pass option.
-
-    --hooks=<value> [--hooks=<value> [...]]
-    -o <value> [-o <value> [...]]
-        Hooks in use. Multi-pass option.
-
-```
-
-## Examples:
-
-### Generating an extension:
-
-`php eecli.php make:addon example_extension --ext --description "Description of addon" --version="1.0.0" --author="Joe Shmoe" --author-url='www.example.com' --has-settings='yes' --hooks=cp_custom_menu`
-
-### Generating a module:
-
-`php eecli.php make:addon my_awesome_mod --mod --description "Description of addon" --version="1.0.0" --author="Joe Shmoe" --author-url='www.example.com' --has-settings='yes'`
-
-### Generating a module in compatibility mode:
-
-`php eecli.php make:addon my_awesome_mod --mod --description "Description of addon" --version="1.0.0" --author="Joe Shmoe" --author-url='www.example.com' --has-settings='yes' --compatibility-mode`
-
diff --git a/docs/cli/intro.md b/docs/cli/intro.md
index bc25ff11b..e918195c0 100644
--- a/docs/cli/intro.md
+++ b/docs/cli/intro.md
@@ -12,7 +12,7 @@ By default the CLI is located `system/ee/eecli.php` .
     - [List](cli/built-in-commands/list.md)
     - Make
         - [make:action - Creates a new action for an add-on](cli/built-in-commands/make-action.md)
-        - [make:addon - Creates a new add-on](cli/built-in-commands/make-addon.md)
+        - [make:addon - Creates a new add-on](development/addon-development-overview.md)
         - [make:command - Creates a new CLI command for an add-on](cli/built-in-commands/make-command.md)
         - [make:extension-hook - Implements an EE extension hook in an add-on](cli/built-in-commands/make-extension-hook.md)
         - [make:migration - Creates a new migration](cli/built-in-commands/make-migration.md)
diff --git a/docs/toc_sections/_advanced_usage_toc.yml b/docs/toc_sections/_advanced_usage_toc.yml
index f3ac4ac5d..6edb45c3c 100644
--- a/docs/toc_sections/_advanced_usage_toc.yml
+++ b/docs/toc_sections/_advanced_usage_toc.yml
@@ -639,8 +639,6 @@
       href: cli/usage.md
     - name: Built In Commands
       items:
-        - name: Addon Generator
-          href: cli/built-in-commands/make-addon.md
         - name: Clear Cache
           href: cli/built-in-commands/cache-clear.md
         - name: Command Generator