diff --git a/Changelog.md b/Changelog.md
index 92827ce8..a2c70d09 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,8 @@
 # Unreleased
 
+- [Fix data layout for custom targets for LLVM 18](https://github.com/rust-osdev/bootloader/pull/421)
+  - Fixes build on latest Rust nightly
+
 # 0.9.24 – 2024-01-28
 
 - Fix data layout for `x86_64-bootloader` target ([#415](https://github.com/rust-osdev/bootloader/pull/415))
diff --git a/example-kernel/x86_64-example-kernel.json b/example-kernel/x86_64-example-kernel.json
index bcb4c8bf..7a0cd61a 100644
--- a/example-kernel/x86_64-example-kernel.json
+++ b/example-kernel/x86_64-example-kernel.json
@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
     "arch": "x86_64",
     "target-endian": "little",
     "target-pointer-width": "64",
diff --git a/test-kernel/x86_64-test-kernel.json b/test-kernel/x86_64-test-kernel.json
index bcb4c8bf..7a0cd61a 100644
--- a/test-kernel/x86_64-test-kernel.json
+++ b/test-kernel/x86_64-test-kernel.json
@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
     "arch": "x86_64",
     "target-endian": "little",
     "target-pointer-width": "64",
diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json
index f40a2b6f..35fc07a3 100644
--- a/x86_64-bootloader.json
+++ b/x86_64-bootloader.json
@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none-gnu",
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
     "linker-flavor": "ld.lld",
     "linker": "rust-lld",
     "pre-link-args": {