diff --git a/README.md b/README.md
index af928c0c8..554003dce 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,19 @@ Advanced IDE for Home Assistant, based on Cloud9 IDE
 
 [:books: IDE add-on documentation][addon-doc-ide]
 
+### ✓ [Pi-hole][addon-pi-hole]
+
+![Latest Version][pi-hole-version-shield]
+![Supports armhf Architecture][pi-hole-armhf-shield]
+![Supports aarch64 Architecture][pi-hole-aarch64-shield]
+![Supports amd64 Architecture][pi-hole-amd64-shield]
+![Supports i386 Architecture][pi-hole-i386-shield]
+![Docker Pulls][pi-hole-pulls-shield]
+
+Network-wide ad blocking using your Hass.io instance
+
+[:books: Pi-hole add-on documentation][addon-doc-pi-hole]
+
 ## Releases
 
 Add-on releases are **NOT** based on [Semantic Versioning][semver], unlike
@@ -173,6 +186,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: Pi-hole][pi-hole-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
 
@@ -294,6 +308,15 @@ SOFTWARE.
 [ide-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [ide-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [ide-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/v1.0.1
+[addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/v1.0.1/README.md
+[pi-hole-issue]: https://github.com/hassio-addons/addon-pi-hole/issues
+[pi-hole-version-shield]: https://img.shields.io/badge/version-v1.0.1-blue.svg
+[pi-hole-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/pi-hole-armhf.svg
+[pi-hole-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[pi-hole-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[pi-hole-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[pi-hole-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [awesome-shield]: https://img.shields.io/badge/awesome%3F-yes-brightgreen.svg
 [discord-shield]: https://img.shields.io/discord/330944238910963714.svg
 [discord]: https://discord.gg/c5DvZ4e
diff --git a/pi-hole/CHANGELOG.md b/pi-hole/CHANGELOG.md
new file mode 100644
index 000000000..02e8d1267
--- /dev/null
+++ b/pi-hole/CHANGELOG.md
@@ -0,0 +1,7 @@
+[Full Changelog][v1.0.0-v1.0.1]
+
+### Fixes
+
+- Fixes log queries issue on upgrade
+
+[v1.0.0-v1.0.1]: https://github.com/hassio-addons/addon-pi-hole/compare/v1.0.0...v1.0.1
\ No newline at end of file
diff --git a/pi-hole/config.json b/pi-hole/config.json
new file mode 100644
index 000000000..839b2ee4e
--- /dev/null
+++ b/pi-hole/config.json
@@ -0,0 +1,67 @@
+{
+  "name": "Pi-hole",
+  "version": "1.0.1",
+  "slug": "pi-hole",
+  "description": "Network-wide ad blocking using your Hass.io instance",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-pi-hole/33817?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/admin/index.php",
+  "startup": "system",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "host_network": true,
+  "hassio_api": true,
+  "privileged": [
+    "NET_ADMIN"
+  ],
+  "map": [
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "password": "",
+    "update_lists_on_start": false,
+    "http_port": 80,
+    "https_port": 443,
+    "dns_port": 53,
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "interface": "",
+    "ipv6": true,
+    "ipv4_address": "",
+    "ipv6_address": "",
+    "virtual_host": "",
+    "hosts": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "password": "str",
+    "update_lists_on_start": "bool",
+    "http_port": "port",
+    "https_port": "port",
+    "dns_port": "port",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "interface": "str",
+    "ipv6": "bool",
+    "ipv4_address": "str",
+    "ipv6_address": "str",
+    "virtual_host": "str",
+    "hosts": [
+      {
+        "name": "str",
+        "ip": "match(((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$)))"
+      }
+    ]
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/pi-hole-{arch}"
+}
\ No newline at end of file
diff --git a/pi-hole/icon.png b/pi-hole/icon.png
new file mode 100644
index 000000000..1a1b4d04d
Binary files /dev/null and b/pi-hole/icon.png differ
diff --git a/pi-hole/logo.png b/pi-hole/logo.png
new file mode 100644
index 000000000..b63eee7fb
Binary files /dev/null and b/pi-hole/logo.png differ