diff --git a/content/collections/docs/addons.md b/content/collections/docs/addons.md
index b49387712..d0fa6e223 100644
--- a/content/collections/docs/addons.md
+++ b/content/collections/docs/addons.md
@@ -19,7 +19,7 @@ You can use Composer to install any addon:
 composer require vendor/package
 ```
 
-The command can be found on the addon's page in the Control Panel or the Statamic Marketplace.
+The command can be found on the addon's page in the [Statamic Marketplace](https://statamic.com/addons).
 
 :::tip
 Some first party addons – such as the Static Site Generator or Eloquent Driver - have their own dedicated commands which will be noted on the same pages.
@@ -49,6 +49,4 @@ You can choose which edition is installed by entering it into your `config/stata
 'addons' => [
     'vendor/package' => 'pro', // e.g., 'jezzdk/statamic-google-maps' => 'pro'
 ]
-```
-
-Or, by choosing it from an addon's details view in the Control Panel.
\ No newline at end of file
+```
\ No newline at end of file
diff --git a/content/collections/docs/git-automation.md b/content/collections/docs/git-automation.md
index 163a43e51..036d465a5 100644
--- a/content/collections/docs/git-automation.md
+++ b/content/collections/docs/git-automation.md
@@ -54,6 +54,7 @@ You are free to define the tracked paths to be considered when staging and commi
 'paths' => [
     base_path('content'),
     base_path('users'),
+    resource_path('addons'),
     resource_path('blueprints'),
     resource_path('fieldsets'),
     resource_path('forms'),
diff --git a/content/collections/extending-docs/addons.md b/content/collections/extending-docs/addons.md
index 578d9de42..be7cb2111 100644
--- a/content/collections/extending-docs/addons.md
+++ b/content/collections/extending-docs/addons.md
@@ -548,6 +548,66 @@ if ($addon->edition() === 'pro') {
 You don't need to check whether a license is valid, Statamic does that automatically for you.
 :::
 
+## Settings
+
+Laravel config files are great for storing application settings, but they're not ideal for settings you might want users to edit through the Control Panel.
+
+You can register a settings blueprint in your addon to give users a friendly interface for managing settings. Drop a blueprint file in `resources/blueprints/settings.yaml` or register it in your service provider like this:
+
+```php
+public function bootAddon()
+{
+    $this->registerSettingsBlueprint([
+        'tabs' => [
+            'main' => [
+                'sections' => [
+                    [
+                        'display' => __('API'),
+                        'fields' => [
+                            [
+                                'handle' => 'api_key',
+                                'field' => ['type' => 'text', 'display' => 'API Key', 'validate' => 'required'],
+                            ],
+                            // ...
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ]);
+}
+```
+
+Your addon's settings page will show up in the Control Panel under **Tools -> Addons**. Pretty convenient.
+
+You can even reference config options (and by extension environment variables) in your settings blueprint using Antlers, like so: `{{ config:app:url }}`.
+
+Settings are stored as YAML files in `resources/addons` by default, but can be moved to the database if you prefer. Just run the `php please install:eloquent-driver` command and you're all set.
+
+You can retrieve the settings using the `Addon` facade:
+
+```php
+use Statamic\Facades\Addon;
+
+$addon = Addon::get('vendor/package');
+
+// Getting settings...
+$addon->settings()->get('api_key');
+
+$addon->settings()->all();
+$addon->settings()->raw(); // Doesn't evaluate Antlers
+
+// Setting values...
+$addon->settings()->set('api_key', '{{ config:services:example:api_key }}');
+
+$addon->settings()->set([
+    'website_name' => 'My Awesome Site',
+    'api_key' => '{{ config:services:example:api_key }}',
+]);
+
+// Saving...
+$addon->settings()->save();
+```
 
 ## Update Scripts
 
diff --git a/content/collections/extending-docs/events.md b/content/collections/extending-docs/events.md
index f259161bd..fd73b910b 100644
--- a/content/collections/extending-docs/events.md
+++ b/content/collections/extending-docs/events.md
@@ -41,6 +41,30 @@ If you're creating an addon, you can quickly [register event listeners or subscr
 
 ## Available Events
 
+### AddonSettingsSaved
+`Statamic\Events\AddonSettingsSaved`
+
+Dispatched after an addon's settings have been saved.
+
+``` php
+public function handle(AddonSettingsSaved $event)
+{
+    $event->addonSettings;
+}
+```
+
+### AddonSettingsSaving
+`Statamic\Events\AddonSettingsSaving`
+
+Dispatched before an addon's settings are saved. You can return `false` to prevent them from being saved.
+
+``` php
+public function handle(AddonSettingsSaving $event)
+{
+    $event->addonSettings;
+}
+```
+
 ### AssetContainerBlueprintFound
 `Statamic\Events\AssetContainerBlueprintFound`