diff --git a/src/ChangeLog b/src/ChangeLog
index 9202673757e..505945e56b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* composite.h (syms_of_composite): Renamed from
+	syms_of_composition.
+
 2001-07-18  Ken Raeburn  <raeburn@gnu.org>
 
 	* fns.c (Fset_char_table_default): Check that a charset is defined
diff --git a/src/composite.h b/src/composite.h
index d1527f53a4b..e30deabb7f6 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,6 +1,7 @@
 /* Header for composite sequence handler.
    Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
+   Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -205,7 +206,7 @@ extern void update_compositions P_ ((int, int, int));
 extern void make_composition_value_copy P_ ((Lisp_Object));
 extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object,
 				Lisp_Object));
-extern void syms_of_composition P_ ((void));
+extern void syms_of_composite P_ ((void));
 extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object,
 			      Lisp_Object));
 extern void compose_chars_in_text P_ ((int, int, Lisp_Object));