diff --git a/ChangeLog b/ChangeLog
index 0d8269680..20ff3f608 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-14  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffobjs.c (cff_face_init): Remove compiler warning. 
+	Suggested by Bram Tassyns in Savannah patch #6651.
+
 2008-10-12  Graham Asher  <graham.asher@btinternet.com>
 
 	* src/sfnt/sfobjs.c (sfnt_load_face): Fix computation of
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 354013130..c80cb82f2 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -659,8 +659,7 @@
         cffface->bbox.xMax = ( dict->font_bbox.xMax + 0xFFFFU ) >> 16;
         cffface->bbox.yMax = ( dict->font_bbox.yMax + 0xFFFFU ) >> 16;
 
-
-        cffface->units_per_EM = dict->units_per_em;
+        cffface->units_per_EM = (FT_UShort)( dict->units_per_em );
 
         cffface->ascender  = (FT_Short)( cffface->bbox.yMax );
         cffface->descender = (FT_Short)( cffface->bbox.yMin );