diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a9818f2660..8d705ed558 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -47,6 +47,8 @@ option - {pull}2866[#2866]
 * Remove `context.db` fields from S3 instrumentation - {pull}2821[#2821]
 * Allowed OpenTelemetry `Span.updateName` to update names provided by elastic - {pull}2838[#2838]
 * Prevent random `NullPointerException` when span compression is not possible - {pull}2859[#2859]
+* Fix security manager issues on OpenJDK 17, with errors like: `java.lang.UnsupportedOperationException: Could not access Unsafe class` -
+{pull}2874[#2874]
 
 [[release-notes-1.x]]
 === Java Agent version 1.x
diff --git a/pom.xml b/pom.xml
index 4ab86732d1..b02296e123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>
         <version.json-schema-validator>1.0.72</version.json-schema-validator>
         <!-- Byte Buddy and ASM must be kept in sync -->
-        <version.byte-buddy>1.12.18</version.byte-buddy>
+        <version.byte-buddy>1.12.19</version.byte-buddy>
         <version.asm>9.4</version.asm>
         <version.cucumber>5.4.0</version.cucumber>