diff --git a/README.md b/README.md
index 3db0a66c3..3b2c78081 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,19 @@ Simple to use control panel for the ultimate home automation setup
 
 [:books: Home Assistant Control Panel add-on documentation][addon-doc-control-panel]
 
+### ✓ [Homebridge][addon-homebridge]
+
+![Latest Version][homebridge-version-shield]
+![Supports armhf Architecture][homebridge-armhf-shield]
+![Supports aarch64 Architecture][homebridge-aarch64-shield]
+![Supports amd64 Architecture][homebridge-amd64-shield]
+![Supports i386 Architecture][homebridge-i386-shield]
+![Docker Pulls][homebridge-pulls-shield]
+
+HomeKit support for your Home Assistant instance using Homebridge
+
+[:books: Homebridge add-on documentation][addon-doc-homebridge]
+
 ## Releases
 
 Add-on releases are **NOT** based on [Semantic Versioning][semver], unlike
@@ -145,6 +158,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Example][example-issue]
 - [Open an issue for the add-on: FTP][ftp-issue]
 - [Open an issue for the add-on: Home Assistant Control Panel][control-panel-issue]
+- [Open an issue for the add-on: Homebridge][homebridge-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
 
@@ -248,6 +262,15 @@ SOFTWARE.
 [control-panel-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [control-panel-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [control-panel-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-homebridge]: https://github.com/hassio-addons/addon-homebridge/tree/v2.4.0
+[addon-doc-homebridge]: https://github.com/hassio-addons/addon-homebridge/blob/v2.4.0/README.md
+[homebridge-issue]: https://github.com/hassio-addons/addon-homebridge/issues
+[homebridge-version-shield]: https://img.shields.io/badge/version-v2.4.0-blue.svg
+[homebridge-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/homebridge-armhf.svg
+[homebridge-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[homebridge-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[homebridge-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[homebridge-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/homebridge/CHANGELOG.md b/homebridge/CHANGELOG.md
new file mode 100644
index 000000000..ab92e415d
--- /dev/null
+++ b/homebridge/CHANGELOG.md
@@ -0,0 +1,14 @@
+[Full Changelog][v2.3.0-v2.4.0]
+
+### Added
+
+- Adds addon logo and icon
+- Warns the user when not using the Hass.io Proxy address
+- Adds support for auto configuring Hass.io API security key
+
+### Changed
+
+- Updates base image to v1.3.3
+- Updates homebridge to v0.4.38 #80 (@funnybutrandom)
+
+[v2.3.0-v2.4.0]: https://github.com/hassio-addons/addon-homebridge/compare/v2.3.0...v2.4.0
\ No newline at end of file
diff --git a/homebridge/config.json b/homebridge/config.json
new file mode 100644
index 000000000..3adf9b49d
--- /dev/null
+++ b/homebridge/config.json
@@ -0,0 +1,48 @@
+{
+  "name": "Homebridge",
+  "version": "2.4.0",
+  "slug": "homebridge",
+  "description": "HomeKit support for your Home Assistant instance using Homebridge",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-homebridge/33803?u=frenck",
+  "startup": "application",
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": true,
+  "host_network": true,
+  "privileged": [],
+  "map": [
+    "config:rw",
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "avahi_interfaces": "",
+    "avahi_hostname": "",
+    "avahi_domainname": "local",
+    "enable_ipv6": true,
+    "packages": [],
+    "init_commands": [],
+    "plugins": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "avahi_interfaces": "str",
+    "avahi_hostname": "str",
+    "avahi_domainname": "str",
+    "enable_ipv6": "bool",
+    "packages": [
+      "str"
+    ],
+    "init_commands": [
+      "str"
+    ],
+    "plugins": [
+      "str"
+    ]
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}",
+    "SUPERVISOR_VERSION": ">=0.82.0"
+  },
+  "image": "hassioaddons/homebridge-{arch}"
+}
\ No newline at end of file
diff --git a/homebridge/icon.png b/homebridge/icon.png
new file mode 100644
index 000000000..99b21ef00
Binary files /dev/null and b/homebridge/icon.png differ
diff --git a/homebridge/logo.png b/homebridge/logo.png
new file mode 100644
index 000000000..8731600cc
Binary files /dev/null and b/homebridge/logo.png differ