diff --git a/overseerr/config.yaml b/overseerr/config.yaml
index 6150ea6..f85fc0c 100644
--- a/overseerr/config.yaml
+++ b/overseerr/config.yaml
@@ -15,5 +15,7 @@ map:
   - addon_config:rw
   - share:rw
   - media:rw
+discovery:
+  - overseerr
 ports:
   5055/tcp: 5055
diff --git a/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/overseerr b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/overseerr
new file mode 100644
index 0000000..e69de29
diff --git a/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/run b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/run
new file mode 100755
index 0000000..9b3f261
--- /dev/null
+++ b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/run
@@ -0,0 +1,22 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: Overseerr
+# Sends discovery information to Home Assistant.
+# ==============================================================================
+declare config
+
+# Wait for Overseerr to become available
+bashio::net.wait_for 5055 127.0.0.1 300
+
+config=$(\
+    bashio::var.json \
+        host "127.0.0.1" \
+        port "^5055" \
+)
+
+if bashio::discovery "overseerr" "${config}" > /dev/null; then
+    bashio::log.info "Successfully send discovery information to Home Assistant."
+else
+    bashio::log.error "Discovery message to Home Assistant failed!"
+fi
diff --git a/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/type b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/type
@@ -0,0 +1 @@
+oneshot
diff --git a/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/up b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/up
new file mode 100644
index 0000000..c51c2ba
--- /dev/null
+++ b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/discovery/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/discovery/run
diff --git a/overseerr/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery b/overseerr/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery
new file mode 100644
index 0000000..e69de29