diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 070d85c8254..52be1847a04 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	PR c/12713
+	* doc/extend.texi: Document interaction of attribute noreturn and
+	longjmp.
+
 2004-09-24  Richard Henderson  <rth@redhat.com>
 
 	PR rtl-opt/17503
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index a407663ae10..f7f52f186b0 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -2015,7 +2015,7 @@ uninitialized variables.
 
 The @code{noreturn} keyword does not affect the exceptional path when that
 applies: a @code{noreturn}-marked function may still return to the caller
-by throwing an exception.
+by throwing an exception or calling @code{longjmp}.
 
 Do not assume that registers saved by the calling function are
 restored before calling the @code{noreturn} function.