diff --git a/changelogs/unreleased/gh-7745-exceptions-on-traces.md b/changelogs/unreleased/gh-7745-exceptions-on-traces.md
new file mode 100644
index 0000000000000000000000000000000000000000..12042c394922a379aa30c512d28e19468b636677
--- /dev/null
+++ b/changelogs/unreleased/gh-7745-exceptions-on-traces.md
@@ -0,0 +1,3 @@
+## feature/luajit
+
+* Now the LuaJIT can handle exceptions on traces (gh-7745).
diff --git a/changelogs/unreleased/gh-8069-luajit-fixes.md b/changelogs/unreleased/gh-8069-luajit-fixes.md
index dff9daff9670d046aad5c4fb56e6b006dfb0be1c..26efbf71861cb5a0bbadabff276cab780ece5c38 100644
--- a/changelogs/unreleased/gh-8069-luajit-fixes.md
+++ b/changelogs/unreleased/gh-8069-luajit-fixes.md
@@ -8,3 +8,5 @@ were fixed as part of this activity:
 * Fixed `pcall()` call without arguments on arm64.
 * Fixed assembling of IR_{AHUV}LOAD specialized to boolean for aarch64.
 * Fixed constant rematerialization on arm64.
+* Fixed `emit_rma()` for x64/GC64 mode for non-`mov` instructions.
+* Limited Lua C library path with the default `PATH_MAX` value of 4096 bytes.
diff --git a/changelogs/unreleased/gh-8516-luajit-fixes.md b/changelogs/unreleased/gh-8516-luajit-fixes.md
new file mode 100644
index 0000000000000000000000000000000000000000..ffa850a5f4356aea040194666c2d4b189ca4a0d8
--- /dev/null
+++ b/changelogs/unreleased/gh-8516-luajit-fixes.md
@@ -0,0 +1,6 @@
+## bugfix/luajit
+
+Backported patches from the vanilla LuaJIT trunk (gh-8516). The following issues
+were fixed as part of this activity:
+
+* Fixed assembling of `IR_LREF` assembling for GC64 mode on x86_64
diff --git a/third_party/luajit b/third_party/luajit
index a17d6826d326dfdac5d58ee35500ee2ac274d66f..8ddd7bcdb83662d649d07dd27e0ee4c6f08265fb 160000
--- a/third_party/luajit
+++ b/third_party/luajit
@@ -1 +1 @@
-Subproject commit a17d6826d326dfdac5d58ee35500ee2ac274d66f
+Subproject commit 8ddd7bcdb83662d649d07dd27e0ee4c6f08265fb