diff --git a/changelogs/unreleased/gh-7230-luajit-fixes.md b/changelogs/unreleased/gh-7230-luajit-fixes.md
index c647863af3649b14b0f2f4f3357555a9358eec5c..a229053ec18aa09aa0e05cf0d8c02981623e3c00 100644
--- a/changelogs/unreleased/gh-7230-luajit-fixes.md
+++ b/changelogs/unreleased/gh-7230-luajit-fixes.md
@@ -4,3 +4,9 @@ Backported patches from vanilla LuaJIT trunk (gh-7230). In the scope of this
 activity, the following issues have been resolved:
 
 * Fix handling of errors during trace snapshot restore.
+
+## feature/luajit
+Backported patches from vanilla LuaJIT trunk (gh-7230). In the scope of this
+activity, the following features is completed:
+
+* `assert()` now accepts any type of error object (from Lua 5.3).
diff --git a/third_party/luajit b/third_party/luajit
index 909afdc6041295917e8bbaf9e70546d30a12ce2a..ae79d993ef95c7d19a4d0512f7722e7d6fec48df 160000
--- a/third_party/luajit
+++ b/third_party/luajit
@@ -1 +1 @@
-Subproject commit 909afdc6041295917e8bbaf9e70546d30a12ce2a
+Subproject commit ae79d993ef95c7d19a4d0512f7722e7d6fec48df