diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 282ca6f1d52..fd1ace2e69d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-21  Juanma Barranquero  <lekktu@gmail.com>
+
+	* entering.texi (Exiting): Fix typo.
+	Reported by D. E. Evans <sinuhe@gnu.org>.
+
 2007-12-31  Martin Rudalics  <rudalics@gmx.at>
 
 	* glossary.texi (Glossary): Fix typo.
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index e338a6a8619..3737e4685e3 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -122,7 +122,7 @@ systems, you can only get back to the shell from which Emacs was run
 
 @vindex cannot-suspend
   Suspending can fail if you run Emacs under a shell that doesn't
-support suspendion of its subjobs, even if the system itself does
+support suspension of its subjobs, even if the system itself does
 support it.  In such a case, you can set the variable
 @code{cannot-suspend} to a non-@code{nil} value to force @kbd{C-z} to
 start an inferior shell.