diff --git a/apmpackage/apm/changelog.yml b/apmpackage/apm/changelog.yml
index 40c98bd64b8..4f9a17c66df 100644
--- a/apmpackage/apm/changelog.yml
+++ b/apmpackage/apm/changelog.yml
@@ -11,6 +11,9 @@
     - description: Remove unsupported 7.x data stream migration pipeline
       type: enhancement
       link: https://github.com/elastic/apm-server/pull/12102
+    - description: Add span.code.stacktrace
+      type: enhancement
+      link: https://github.com/elastic/apm-server/pull/12096
 - version: 8.11.0
   changes:
     - description: Add geoip processing to add client.geo.* fields for app_logs
diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml
index e20f4ffcf7d..d54cf979d18 100644
--- a/apmpackage/apm/data_stream/traces/fields/fields.yml
+++ b/apmpackage/apm/data_stream/traces/fields/fields.yml
@@ -333,6 +333,10 @@
   description: |
     The approximate number of spans represented, based on the inverse sampling rate.
     This will only be set when the sampling rate is known.
+- name: code.stacktrace
+  type: text
+  description: |
+    OTel stack trace
 - name: timestamp.us
   type: long
   description: |
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index 4d12089d629..eb4202d4777 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -19,3 +19,4 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits]
 [float]
 ==== Added
 - map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown`
+- Add support for Otel code.stacktrace {pull}12096[12096]