diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cd63d7dec7..bb0d3598b00 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* composite.el (auto-compose-chars): Fix typo in docstring.
+
 2009-03-24  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/ange-ftp.el (ange-ftp-skip-msgs): Add 534.
diff --git a/lisp/composite.el b/lisp/composite.el
index 7c04bcff088..d3c000fe839 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -712,9 +712,7 @@ FUNC is called with one argument GSTRING which is built for characters
 in the region FROM (inclusive) and TO (exclusive).
 
 If the character are composed on a graphic display, FONT-OBJECT
-is a font to use.
-
-Otherwise, FONT-OBJECT is nil, and the fucntion
+is a font to use.  Otherwise, FONT-OBJECT is nil, and the function
 `compose-gstring-for-terminal' is used instead of FUNC.
 
 If STRING is non-nil, it is a string, and FROM and TO are indices