diff --git a/README.md b/README.md
index 594359f9b..06489be68 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,19 @@ Browser-based log utility for Hass.io (Home Assistant)
 
 [:books: Log Viewer add-on documentation][addon-doc-log-viewer]
 
+### ✓ [Lovelace Migration][addon-lovelace-migration]
+
+![Latest Version][lovelace-migration-version-shield]
+![Supports armhf Architecture][lovelace-migration-armhf-shield]
+![Supports aarch64 Architecture][lovelace-migration-aarch64-shield]
+![Supports amd64 Architecture][lovelace-migration-amd64-shield]
+![Supports i386 Architecture][lovelace-migration-i386-shield]
+![Docker Pulls][lovelace-migration-pulls-shield]
+
+Automatically convert your existing UI to the new Lovelace UI
+
+[:books: Lovelace Migration add-on documentation][addon-doc-lovelace-migration]
+
 ### ✓ [Node-RED][addon-node-red]
 
 ![Latest Version][node-red-version-shield]
@@ -386,6 +399,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: Jupyter][jupyter-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: 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]
@@ -563,6 +577,15 @@ SOFTWARE.
 [log-viewer-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [log-viewer-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [log-viewer-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-lovelace-migration]: https://github.com/hassio-addons/addon-lovelace-migration/tree/daa601f
+[addon-doc-lovelace-migration]: https://github.com/hassio-addons/addon-lovelace-migration/blob/daa601f/README.md
+[lovelace-migration-issue]: https://github.com/hassio-addons/addon-lovelace-migration/issues
+[lovelace-migration-version-shield]: https://img.shields.io/badge/version-daa601f-blue.svg
+[lovelace-migration-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/lovelace-migration.svg
+[lovelace-migration-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[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-node-red]: https://github.com/hassio-addons/addon-node-red/tree/e974aea
 [addon-doc-node-red]: https://github.com/hassio-addons/addon-node-red/blob/e974aea/README.md
 [node-red-issue]: https://github.com/hassio-addons/addon-node-red/issues
diff --git a/lovelace-migration/CHANGELOG.md b/lovelace-migration/CHANGELOG.md
new file mode 100644
index 000000000..f6a43e0aa
--- /dev/null
+++ b/lovelace-migration/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/07/26 21:03 UTC - [daa601f](https://github.com/hassio-addons/addon-lovelace-migration/commit/daa601f080905a79500b0a75fb30a9f3078fd288) by [@dale3h](https://github.com/dale3h)
+> 📚 Fixes Lovelace docs link 
+
diff --git a/lovelace-migration/README.md b/lovelace-migration/README.md
new file mode 100644
index 000000000..8d0b39657
--- /dev/null
+++ b/lovelace-migration/README.md
@@ -0,0 +1,56 @@
+# Community Hass.io Add-ons: Lovelace Migration
+
+[![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]
+
+This add-on automatically converts your existing UI to the new Lovelace UI.
+
+## About
+
+The new Lovelace UI for Home Assistant is here, and it is extremely fast,
+extremely customizable and extremely extensible.
+
+Building the Lovelace UI configuration from scratch can be a bit of a
+daunting task, so this add-on helps create a starting point to work from.
+In most cases you will only need to run this add-on once, but if ever you
+do you need to run it again, backups of your existing `ui-lovelace.yaml` file
+are automatically created and maintained.
+
+[Click here to read more about Lovelace UI][lovelace-docs]
+
+[Click here for the full documentation][docs]
+
+## WARNING! THIS IS AN EDGE VERSION!
+
+This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
+add-ons are based upon the latest development version.
+
+- They may not work at all.
+- 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.
+- Developers.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[lovelace-docs]: https://www.home-assistant.io/lovelace/
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[release-shield]: https://img.shields.io/badge/version-daa601f-blue.svg
+[release]: https://github.com/hassio-addons/addon-lovelace-migration/tree/daa601f
+[docs]: https://github.com/hassio-addons/addon-lovelace-migration/blob/daa601f/README.md
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/dale3h
\ No newline at end of file
diff --git a/lovelace-migration/config.json b/lovelace-migration/config.json
new file mode 100644
index 000000000..368f28b8a
--- /dev/null
+++ b/lovelace-migration/config.json
@@ -0,0 +1,39 @@
+{
+  "name": "Lovelace Migration",
+  "version": "daa601f",
+  "slug": "lovelace-migration",
+  "description": "Automatically convert your existing UI to the new Lovelace UI",
+  "url": "https://github.com/hassio-addons/addon-lovelace-migration",
+  "startup": "once",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": true,
+  "map": [
+    "config:rw",
+    "share:rw",
+    "backup:rw"
+  ],
+  "options": {
+    "log_level": "info",
+    "output": "/config/ui-lovelace.yaml",
+    "init_commands": [],
+    "post_commands": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "output": "str",
+    "init_commands": [
+      "str"
+    ],
+    "post_commands": [
+      "str"
+    ]
+  },
+  "image": "hassioaddons/lovelace-migration"
+}
\ No newline at end of file
diff --git a/lovelace-migration/icon.png b/lovelace-migration/icon.png
new file mode 100644
index 000000000..ee15fecd2
Binary files /dev/null and b/lovelace-migration/icon.png differ
diff --git a/lovelace-migration/logo.png b/lovelace-migration/logo.png
new file mode 100644
index 000000000..75fa6ed01
Binary files /dev/null and b/lovelace-migration/logo.png differ