diff --git a/README.md b/README.md
index d12c99726..4d8fcc294 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,19 @@ Advanced IDE for Home Assistant, based on Cloud9 IDE
 
 [:books: IDE add-on documentation][addon-doc-ide]
 
+### ✓ [InfluxDB][addon-influxdb]
+
+![Latest Version][influxdb-version-shield]
+![Supports armhf Architecture][influxdb-armhf-shield]
+![Supports aarch64 Architecture][influxdb-aarch64-shield]
+![Supports amd64 Architecture][influxdb-amd64-shield]
+![Supports i386 Architecture][influxdb-i386-shield]
+![Docker Pulls][influxdb-pulls-shield]
+
+Scalable datastore for metrics, events, and real-time analytics
+
+[:books: InfluxDB add-on documentation][addon-doc-influxdb]
+
 ### ✓ [Jupyter][addon-jupyter]
 
 ![Latest Version][jupyter-version-shield]
@@ -291,6 +304,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Home Assistant Control Panel][control-panel-issue]
 - [Open an issue for the add-on: Homebridge][homebridge-issue]
 - [Open an issue for the add-on: IDE][ide-issue]
+- [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: Pi-hole][pi-hole-issue]
 - [Open an issue for the add-on: Plex Media Server][plex-issue]
@@ -429,6 +443,15 @@ SOFTWARE.
 [ide-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [ide-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [ide-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-influxdb]: https://github.com/hassio-addons/addon-influxdb/tree/2ad30fe
+[addon-doc-influxdb]: https://github.com/hassio-addons/addon-influxdb/blob/2ad30fe/README.md
+[influxdb-issue]: https://github.com/hassio-addons/addon-influxdb/issues
+[influxdb-version-shield]: https://img.shields.io/badge/version-2ad30fe-blue.svg
+[influxdb-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/influxdb-armhf.svg
+[influxdb-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[influxdb-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[influxdb-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[influxdb-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-jupyter]: https://github.com/hassio-addons/addon-jupyter/tree/08be876
 [addon-doc-jupyter]: https://github.com/hassio-addons/addon-jupyter/blob/08be876/README.md
 [jupyter-issue]: https://github.com/hassio-addons/addon-jupyter/issues
diff --git a/influxdb/CHANGELOG.md b/influxdb/CHANGELOG.md
new file mode 100644
index 000000000..a7c633fc5
--- /dev/null
+++ b/influxdb/CHANGELOG.md
@@ -0,0 +1,3 @@
+2018/05/27 13:42 UTC - [2ad30fe](https://github.com/hassio-addons/addon-influxdb/commit/2ad30fedfa392f6e51d03773659e626d1417f31a) by [@frenck](https://github.com/frenck)
+> :shirt: Fixes Hadolint warnings 
+
diff --git a/influxdb/README.md b/influxdb/README.md
new file mode 100644
index 000000000..9e9e21800
--- /dev/null
+++ b/influxdb/README.md
@@ -0,0 +1,49 @@
+# Community Hass.io Add-ons: InfluxDB
+
+[![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]
+
+Scalable datastore for metrics, events, and real-time analytics.
+
+## About
+
+InfluxDB is an open source time series database optimized for high-write-volume.
+It's useful for recording metrics, sensor data, events,
+and performing analytics. It exposes an HTTP API for client interaction and if
+often used in combination with Grafana to visualize the data.
+
+[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>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-influxdb/blob/2ad30fe/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/?u=frenck
+[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-2ad30fe-blue.svg
+[release]: https://github.com/hassio-addons/addon-influxdb/tree/2ad30fe
\ No newline at end of file
diff --git a/influxdb/config.json b/influxdb/config.json
new file mode 100644
index 000000000..2cb6ac026
--- /dev/null
+++ b/influxdb/config.json
@@ -0,0 +1,52 @@
+{
+  "name": "InfluxDB",
+  "version": "2ad30fe",
+  "slug": "influxdb",
+  "description": "Scalable datastore for metrics, events, and real-time analytics",
+  "url": "https://community.home-assistant.io/?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:8888]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "boot": "auto",
+  "ports": {
+    "8086/tcp": 8086,
+    "8888/tcp": 8888
+  },
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "options": {
+    "log_level": "info",
+    "username": "",
+    "password": "",
+    "auth": true,
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "ipv6": true
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "username": "str",
+    "password": "str",
+    "auth": "bool",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "ipv6": "bool"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/influxdb-{arch}"
+}
\ No newline at end of file
diff --git a/influxdb/icon.png b/influxdb/icon.png
new file mode 100644
index 000000000..e97bdce46
Binary files /dev/null and b/influxdb/icon.png differ
diff --git a/influxdb/logo.png b/influxdb/logo.png
new file mode 100644
index 000000000..1683a0931
Binary files /dev/null and b/influxdb/logo.png differ