diff --git a/ChangeLog b/ChangeLog
index a45ff14ce..dc9687d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* src/base/ftmac.c (open_face_from_buffer): The argument
+	`driver_name' is typed as `const char*' to match with the
+	callers in FT_New_Face_From_LWFN and FT_New_Face_From_SFNT.
+	This is same with open_face_from_buffer in src/base/ftobjs.c.
+	Found and fixed by Sean McBride.
+
 2007-07-28  Werner Lemberg  <wl@gnu.org>
 
 	* src/raster/ftraster.c (count_table): Make it conditional.
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index fd6201adb..c321f4db4 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -707,12 +707,12 @@
 
   /* Create a new FT_Face given a buffer and a driver name. */
   static FT_Error
-  open_face_from_buffer( FT_Library  library,
-                         FT_Byte*    base,
-                         FT_ULong    size,
-                         FT_Long     face_index,
-                         char*       driver_name,
-                         FT_Face*    aface )
+  open_face_from_buffer( FT_Library   library,
+                         FT_Byte*     base,
+                         FT_ULong     size,
+                         FT_Long      face_index,
+                         const char*  driver_name,
+                         FT_Face*     aface )
   {
     FT_Open_Args  args;
     FT_Error      error;