diff --git a/ChangeLog b/ChangeLog
index afb006001..8fddfb4aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-07  Werner Lemberg  <wl@gnu.org>
+
+	[cff] s/cf2_getGlyphWidth/cf2_getGlyphOutline/.
+
+	* src/cff/cf2font.c, src/cff/cf2font.h, src/cff/cf2ft.c: Do it.
+
 2013-06-06  Dave Arnold  <darnold@adobe.com>
 
 	[cff] Add early exit feature for width-only calls.
diff --git a/src/cff/cf2font.c b/src/cff/cf2font.c
index 39402c301..8b2331d62 100644
--- a/src/cff/cf2font.c
+++ b/src/cff/cf2font.c
@@ -318,10 +318,10 @@
 
   /* equivalent to AdobeGetOutline */
   FT_LOCAL_DEF( FT_Error )
-  cf2_getGlyphWidth( CF2_Font           font,
-                     CF2_Buffer         charstring,
-                     const CF2_Matrix*  transform,
-                     CF2_F16Dot16*      glyphWidth )
+  cf2_getGlyphOutline( CF2_Font           font,
+                       CF2_Buffer         charstring,
+                       const CF2_Matrix*  transform,
+                       CF2_F16Dot16*      glyphWidth )
   {
     FT_Error  lastError = FT_Err_Ok;
 
diff --git a/src/cff/cf2font.h b/src/cff/cf2font.h
index 4e1c337d8..f9dd1bbd4 100644
--- a/src/cff/cf2font.h
+++ b/src/cff/cf2font.h
@@ -99,10 +99,10 @@ FT_BEGIN_HEADER
 
 
   FT_LOCAL( FT_Error )
-  cf2_getGlyphWidth( CF2_Font           font,
-                     CF2_Buffer         charstring,
-                     const CF2_Matrix*  transform,
-                     CF2_F16Dot16*      glyphWidth );
+  cf2_getGlyphOutline( CF2_Font           font,
+                       CF2_Buffer         charstring,
+                       const CF2_Matrix*  transform,
+                       CF2_F16Dot16*      glyphWidth );
 
 
 FT_END_HEADER
diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c
index 965e5451b..c09a0244a 100644
--- a/src/cff/cf2ft.c
+++ b/src/cff/cf2ft.c
@@ -352,7 +352,7 @@
       if ( error2 )
         return error2;
 
-      error2 = cf2_getGlyphWidth( font, &buf, &transform, &glyphWidth );
+      error2 = cf2_getGlyphOutline( font, &buf, &transform, &glyphWidth );
       if ( error2 )
         return FT_ERR( Invalid_File_Format );