diff --git a/ChangeLog b/ChangeLog
index 664d879da..abf7c3858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-27  Chia-I Wu  <b90201047@ntu.edu.tw>
+
+	* src/base/ftobjs.c (FT_Set_Char_Size): Ahh.. forgot to check the case
+	width or height is 0.
+
 2006-02-27  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* builds/mac/FreeType.m68k_cfm.make.txt,
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index ddb21573d..16aac1a5e 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2382,6 +2382,11 @@
     FT_Size_RequestRec  req;
 
 
+    if ( !char_width )
+      char_width = char_height;
+    else if ( !char_height )
+      char_height = char_width;
+
     if ( char_width  < 1 * 64 )
       char_width  = 1 * 64;
     if ( char_height < 1 * 64 )