diff --git a/lix/libexpr/builtins/addErrorContext.md b/lix/libexpr/builtins/addErrorContext.md
new file mode 100644
index 000000000..6d99659bb
--- /dev/null
+++ b/lix/libexpr/builtins/addErrorContext.md
@@ -0,0 +1,96 @@
+---
+name: addErrorContext
+args: [message, expr]
+---
+
+This adds a `message` to be shown in the stacktrace in the event of
+a failure during the evaluation of `expr`.
+
+For example, if a file `err.nix` contains the following:
+
+```nix
+let
+  countDown =
+    n:
+    if n == 0 then
+      throw "kaboom"
+    else
+      builtins.addErrorContext "while counting down; n = ${toString n}" ("x" + countDown (n - 1));
+in
+countDown 2
+```
+
+Then, evaluating the file will give the following stack trace:
+
+```console
+$ nix-instantiate --show-trace err.nix
+error:
+       … from call site
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:9:1:
+            8| in
+            9| countDown 2
+             | ^
+           10|
+
+       … while calling 'countDown'
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:3:5:
+            2|   countDown =
+            3|     n:
+             |     ^
+            4|     if n == 0 then
+
+       … while calling the 'addErrorContext' builtin
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:7:7:
+            6|     else
+            7|       builtins.addErrorContext "while counting down; n = ${toString n}" ("x" + countDown (n - 1));
+             |       ^
+            8| in
+
+       … while counting down; n = 2
+
+       … from call site
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:7:80:
+            6|     else
+            7|       builtins.addErrorContext "while counting down; n = ${toString n}" ("x" + countDown (n - 1));
+             |                                                                                ^
+            8| in
+
+       … while calling 'countDown'
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:3:5:
+            2|   countDown =
+            3|     n:
+             |     ^
+            4|     if n == 0 then
+
+       … while calling the 'addErrorContext' builtin
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:7:7:
+            6|     else
+            7|       builtins.addErrorContext "while counting down; n = ${toString n}" ("x" + countDown (n - 1));
+             |       ^
+            8| in
+
+       … while counting down; n = 1
+
+       … from call site
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:7:80:
+            6|     else
+            7|       builtins.addErrorContext "while counting down; n = ${toString n}" ("x" + countDown (n - 1));
+             |                                                                                ^
+            8| in
+
+       … while calling 'countDown'
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:3:5:
+            2|   countDown =
+            3|     n:
+             |     ^
+            4|     if n == 0 then
+
+       … caused by explicit throw
+         at /home/plop/git.lix.systems/lix-project/lix/err.nix:5:7:
+            4|     if n == 0 then
+            5|       throw "kaboom"
+             |       ^
+            6|     else
+
+       error: kaboom
+```
diff --git a/lix/libexpr/meson.build b/lix/libexpr/meson.build
index 0fd3c24a1..0e2d02950 100644
--- a/lix/libexpr/meson.build
+++ b/lix/libexpr/meson.build
@@ -51,6 +51,7 @@ builtin_definitions = files(
   'builtins/abort.md',
   'builtins/add.md',
   'builtins/addDrvOutputDependencies.md',
+  'builtins/addErrorContext.md',
   'builtins/all.md',
   'builtins/any.md',
   'builtins/attrNames.md',
diff --git a/lix/libexpr/primops.cc b/lix/libexpr/primops.cc
index 55e34cc33..cc4a7a9cb 100644
--- a/lix/libexpr/primops.cc
+++ b/lix/libexpr/primops.cc
@@ -673,12 +673,6 @@ static void prim_addErrorContext(EvalState & state, Value * * args, Value & v)
     }
 }
 
-static RegisterPrimOp primop_addErrorContext(PrimOp{{
-    .name = "__addErrorContext",
-    .arity = 2,
-    .fun = prim_addErrorContext,
-}});
-
 static void prim_ceil(EvalState & state, Value * * args, Value & v)
 {
     auto value = state.forceFloat(*args[0], noPos,