diff --git a/man/ChangeLog b/man/ChangeLog
index b1318648540..f1288c3c1a2 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,6 +1,10 @@
+2006-10-06  Romain Francoise  <romain@orebokech.com>
+
+	* faq.texi (VM): VM works with Emacs 22 too. 
+
 2006-10-06  Richard Stallman  <rms@gnu.org>
 
-	* ebrowse.texi:  Remove Emacs version "21" from title.
+	* ebrowse.texi: Remove Emacs version "21" from title.
 
 2006-10-05  Kim F. Storm  <storm@cua.dk>
 
diff --git a/man/faq.texi b/man/faq.texi
index 1230fff62bb..8f8068dd6dd 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -3848,8 +3848,8 @@ Java code.  It is distributed with Emacs, but has
 Or send reports to @email{bug-vm@@wonderworks.com}
 @end table
 
-VM 7 works well with Emacs 21. Older versions of VM suitable for use
-with older versions of Emacs are available from
+VM 7 works well with Emacs 21 and Emacs 22. Older versions of VM
+suitable for use with older versions of Emacs are available from
 @uref{ftp://ftp.wonderworks.com/pub/vm/, the same FTP site}.