diff --git a/README.md b/README.md
index 914ff2814..f0af4ac26 100644
--- a/README.md
+++ b/README.md
@@ -314,6 +314,19 @@ Manage your Docker environment with ease
 
 [:books: Portainer add-on documentation][addon-doc-portainer]
 
+### ✓ [SQLite Web][addon-sqlite-web]
+
+![Latest Version][sqlite-web-version-shield]
+![Supports armhf Architecture][sqlite-web-armhf-shield]
+![Supports aarch64 Architecture][sqlite-web-aarch64-shield]
+![Supports amd64 Architecture][sqlite-web-amd64-shield]
+![Supports i386 Architecture][sqlite-web-i386-shield]
+![Docker Pulls][sqlite-web-pulls-shield]
+
+Explore your SQLite database
+
+[:books: SQLite Web add-on documentation][addon-doc-sqlite-web]
+
 ### ✓ [SSH & Web Terminal][addon-ssh]
 
 ![Latest Version][ssh-version-shield]
@@ -459,6 +472,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
 - [Open an issue for the add-on: Plex Media Server][plex-issue]
 - [Open an issue for the add-on: Portainer][portainer-issue]
+- [Open an issue for the add-on: SQLite Web][sqlite-web-issue]
 - [Open an issue for the add-on: SSH & Web Terminal][ssh-issue]
 - [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
 - [Open an issue for the add-on: Spotify Connect][spotify-issue]
@@ -705,6 +719,15 @@ SOFTWARE.
 [portainer-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [portainer-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [portainer-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
+[addon-sqlite-web]: https://github.com/hassio-addons/addon-sqlite-web/tree/895e087
+[addon-doc-sqlite-web]: https://github.com/hassio-addons/addon-sqlite-web/blob/895e087/README.md
+[sqlite-web-issue]: https://github.com/hassio-addons/addon-sqlite-web/issues
+[sqlite-web-version-shield]: https://img.shields.io/badge/version-895e087-blue.svg
+[sqlite-web-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/sqlite-web.svg
+[sqlite-web-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[sqlite-web-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[sqlite-web-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[sqlite-web-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/5eff134
 [addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/5eff134/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
diff --git a/sqlite-web/CHANGELOG.md b/sqlite-web/CHANGELOG.md
new file mode 100644
index 000000000..2e94334ca
--- /dev/null
+++ b/sqlite-web/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/09/16 10:34 UTC - [895e087](https://github.com/hassio-addons/addon-sqlite-web/commit/895e08728a169d1f10d68ad0712c2e69b6ee061b) by [@ludeeus](https://github.com/ludeeus)
+> :shirt: Corrections for markdownlint 
+
diff --git a/sqlite-web/README.md b/sqlite-web/README.md
new file mode 100644
index 000000000..e93cd357b
--- /dev/null
+++ b/sqlite-web/README.md
@@ -0,0 +1,49 @@
+# Community Hass.io Add-ons: SQLite Web
+
+[![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]
+
+Explore your Home-Assistant database from your web browser!
+
+## About
+
+This enables you to easily explore all tables and content that is saved in your database.
+
+[Click here for the full documentation][docs]
+
+![Home Assistant Control Panel screenshot][screenshot]
+
+## 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>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/ludeeus
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-sqlite-web/blob/895e087/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io
+[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-895e087-blue.svg
+[release]: https://github.com/hassio-addons/addon-sqlite-web/tree/895e087
+[screenshot]: https://github.com/hassio-addons/addon-sqlite-web/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/sqlite-web/config.json b/sqlite-web/config.json
new file mode 100644
index 000000000..5c4b18bf0
--- /dev/null
+++ b/sqlite-web/config.json
@@ -0,0 +1,57 @@
+{
+  "name": "SQLite Web",
+  "version": "895e087",
+  "slug": "sqlite-web",
+  "description": "Explore your SQLite database",
+  "url": "https://github.com/hassio-addons/addon-sqlite-web/tree/master/README.md",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:6210]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "ports": {
+    "6210/tcp": 6210,
+    "6220/tcp": 6220
+  },
+  "map": [
+    "ssl",
+    "config:rw"
+  ],
+  "options": {
+    "log_level": "info",
+    "database_path": "home-assistant_v2.db",
+    "read_only": true,
+    "datasette": false,
+    "username": "",
+    "password": "",
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "ipv6": false
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "database_path": "str",
+    "read_only": "bool",
+    "datasette": "bool",
+    "username": "str",
+    "password": "str",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "ipv6": "bool",
+    "i_like_to_be_pwned": "bool?",
+    "leave_front_door_open": "bool?"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/sqlite-web"
+}
\ No newline at end of file
diff --git a/sqlite-web/icon.png b/sqlite-web/icon.png
new file mode 100644
index 000000000..c18dcf563
Binary files /dev/null and b/sqlite-web/icon.png differ
diff --git a/sqlite-web/logo.png b/sqlite-web/logo.png
new file mode 100644
index 000000000..b6f804d44
Binary files /dev/null and b/sqlite-web/logo.png differ