diff --git a/README.md b/README.md
index 60de1e96..ff9b4e62 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,19 @@ Automatically convert your existing UI to the new Lovelace UI
 
 [:books: Lovelace Migration add-on documentation][addon-doc-lovelace-migration]
 
+### ✓ [Lutron Certificate][addon-lutron-cert]
+
+![Latest Version][lutron-cert-version-shield]
+![Supports armhf Architecture][lutron-cert-armhf-shield]
+![Supports aarch64 Architecture][lutron-cert-aarch64-shield]
+![Supports amd64 Architecture][lutron-cert-amd64-shield]
+![Supports i386 Architecture][lutron-cert-i386-shield]
+![Docker Pulls][lutron-cert-pulls-shield]
+
+Generate certificate to control Lutron Caseta bridge locally
+
+[:books: Lutron Certificate add-on documentation][addon-doc-lutron-cert]
+
 ### ✓ [Node-RED][addon-node-red]
 
 ![Latest Version][node-red-version-shield]
@@ -444,6 +457,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: InfluxDB][influxdb-issue]
 - [Open an issue for the add-on: Log Viewer][log-viewer-issue]
 - [Open an issue for the add-on: Lovelace Migration][lovelace-migration-issue]
+- [Open an issue for the add-on: Lutron Certificate][lutron-cert-issue]
 - [Open an issue for the add-on: Node-RED][node-red-issue]
 - [Open an issue for the add-on: Octobox][octobox-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
@@ -633,6 +647,15 @@ SOFTWARE.
 [lovelace-migration-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [lovelace-migration-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [lovelace-migration-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-lutron-cert]: https://github.com/hassio-addons/addon-lutron-cert/tree/v0.1.0
+[addon-doc-lutron-cert]: https://github.com/hassio-addons/addon-lutron-cert/blob/v0.1.0/README.md
+[lutron-cert-issue]: https://github.com/hassio-addons/addon-lutron-cert/issues
+[lutron-cert-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[lutron-cert-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/lutron-cert.svg
+[lutron-cert-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[lutron-cert-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[lutron-cert-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[lutron-cert-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-node-red]: https://github.com/hassio-addons/addon-node-red/tree/v0.7.0
 [addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/v0.7.0/README.md
 [node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
diff --git a/lutron-cert/CHANGELOG.md b/lutron-cert/CHANGELOG.md
new file mode 100644
index 00000000..e69de29b
diff --git a/lutron-cert/README.md b/lutron-cert/README.md
new file mode 100644
index 00000000..9f270dee
--- /dev/null
+++ b/lutron-cert/README.md
@@ -0,0 +1,71 @@
+# Community Hass.io Add-ons: Lutron Certificate
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+
+A simple utility to generate signed certificate files to allow local control of
+a Lutron Caseta smart bridge.
+
+## About
+
+This add-on will guide you through the necessary steps to create signed
+certificate files necessary to control your Lutron Caseta smart bridge with
+Home Assistant.
+
+Three files will be created during successful execution of the wizard:
+
+- `/ssl/lutron/caseta.key`: the private key file used to generate the
+  certificate.
+- `/ssl/lutron/caseta.crt`: the signed certificate file used to connect to
+  the Lutron Caseta bridge.
+- `/ssl/lutron/caseta-bridge.crt`: the certificate authority file that is
+  downloaded from the Lutron Caseta bridge.
+
+Be sure to add Lutron Caseta to your `configuration.yaml` after starting the
+add-on:
+
+```yaml
+lutron_caseta:
+  host: 192.168.1.100
+  keyfile: /ssl/lutron/caseta.key
+  certfile: /ssl/lutron/caseta.crt
+  ca_certs: /ssl/lutron/caseta-bridge.crt
+```
+
+For more information on how to configure Lutron Caseta in Home Assistant see
+the [Lutron Caseta documentation][lutron-caseta-docs].
+
+[Click here for the full documentation][docs]
+
+## WARNING! THIS IS A BETA VERSION!
+
+This Hass.io Add-ons repository contains beta releases of add-ons.
+
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+This repository was created for:
+
+- Anybody willing to test.
+- Anybody interested in trying out upcoming add-ons or add-on features.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/dale3h
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-lutron-cert/blob/v0.1.0/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-lutron-certificate/70317
+[lutron-caseta-docs]: https://www.home-assistant.io/components/lutron_caseta/
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-lutron-cert/tree/v0.1.0
\ No newline at end of file
diff --git a/lutron-cert/config.json b/lutron-cert/config.json
new file mode 100644
index 00000000..55a3ff52
--- /dev/null
+++ b/lutron-cert/config.json
@@ -0,0 +1,36 @@
+{
+  "name": "Lutron Certificate",
+  "version": "0.1.0",
+  "slug": "lutron-cert",
+  "description": "Generate certificate to control Lutron Caseta bridge locally",
+  "url": "https://github.com/hassio-addons/addon-lutron-cert",
+  "startup": "once",
+  "webui": "http://[HOST]:[PORT:5817]",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "manual",
+  "hassio_role": "default",
+  "hassio_api": true,
+  "homeassistant_api": true,
+  "ports": {
+    "5817/tcp": 5817
+  },
+  "map": [
+    "ssl:rw",
+    "addons"
+  ],
+  "options": {
+    "log_level": "info"
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/lutron-cert"
+}
\ No newline at end of file
diff --git a/lutron-cert/icon.png b/lutron-cert/icon.png
new file mode 100644
index 00000000..90abbd74
Binary files /dev/null and b/lutron-cert/icon.png differ
diff --git a/lutron-cert/logo.png b/lutron-cert/logo.png
new file mode 100644
index 00000000..59b59c02
Binary files /dev/null and b/lutron-cert/logo.png differ