diff --git a/README.md b/README.md
index a594f40f7..ddd2e9090 100644
--- a/README.md
+++ b/README.md
@@ -198,12 +198,16 @@ disabled in a configure step before building with WASI SDK.
 ## Notable Limitations
 
 This repository does not yet support __C++ exceptions__. C++ code is supported
-only with -fno-exceptions for now. Similarly, there is not yet support for
-setjmp/longjmp. Work on support for [exception handling] is underway at the
-language level which will support both of these features.
+only with -fno-exceptions for now.
+Work on support for [exception handling] is underway at the
+language level which will support the features.
 
 [exception handling]: https://github.com/WebAssembly/exception-handling/
 
+See [C setjmp/longjmp support] about setjmp/longjmp support.
+
+[C setjmp/longjmp support]: SetjmpLongjmp.md
+
 This repository experimentally supports __threads__ with
 `--target=wasm32-wasi-threads`. It uses WebAssembly's [threads] primitives
 (atomics, `wait`/`notify`, shared memory) and [wasi-threads] for spawning