diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 0e4810bb..8e2377a0 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,9 @@
+2024-12-04: Henning Meyer <hmeyer.eu@gmail.com>
+    * debuginfod.cxx:
+    (handle_options): new_function
+    (handle_buildid, handle_metrics, handle_root, handle_metadata):
+    add Access-Control-Allow-Origin header
+    (handler_cb): handle http OPTIONS method
  2023-04-21  Frank Ch. Eigler <fche@redhat.com>

      * debuginfod.cxx (groom): Fix -r / -X logic.
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 4bb517bd..7f7d304f 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -3365,6 +3365,7 @@ handle_buildid (MHD_Connection* conn,
              {
                add_mhd_response_header (r, "Content-Type",
                         "application/octet-stream");
+              add_mhd_response_header (r, 
"Access-Control-Allow-Origin", "*");
                // Copy the incoming headers
                const char * hdrs = debuginfod_get_headers(client);