diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 76577d410..96a2e5dfc 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -157,3 +157,4 @@ From oldest to newest contributor, we would like to thank:
 - [Stephen Heumann](https://github.com/sheumann)
 - [Joshua Batty](https://github.com/joshuabatty)
 - [Dana Jansens](https://github.com/danakj)
+- [Mathias Gredal](https://github.com/mathiasgredal)
diff --git a/etc/config/java.amazon.properties b/etc/config/java.amazon.properties
index 0bb2fb1ec..0ba16609d 100644
--- a/etc/config/java.amazon.properties
+++ b/etc/config/java.amazon.properties
@@ -1,4 +1,4 @@
-compilers=&java8:&java9:&java10:&java11:&java12:&java13:&java14:&java15:&java16:&java17:&java18:&java19:&java20:&java21:&java22:&java23
+compilers=&java8:&java9:&java10:&java11:&java12:&java13:&java14:&java15:&java16:&java17:&java18:&java19:&java20:&java21:&java22:&java23:&java24
 compilerType=java
 versionFlag=-version
 defaultCompiler=java2102
@@ -150,3 +150,10 @@ group.java23.objdumper=/opt/compiler-explorer/jdk-23.0.1/bin/javap
 compiler.java2301.exe=/opt/compiler-explorer/jdk-23.0.1/bin/javac
 compiler.java2301.runtime=/opt/compiler-explorer/jdk-23.0.1/bin/java
 compiler.java2301.semver=23.0.1
+
+group.java24.compilers=java2400
+group.java24.groupName=OpenJDK 24
+group.java24.objdumper=/opt/compiler-explorer/jdk-24.0.0/bin/javap
+compiler.java2400.exe=/opt/compiler-explorer/jdk-24.0.0/bin/javac
+compiler.java2400.runtime=/opt/compiler-explorer/jdk-24.0.0/bin/java
+compiler.java2400.semver=24.0.0