diff --git a/ChangeLog b/ChangeLog
index e08d918..d0f1765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-20  Willem Rein Oudshoorn  <woudshoo@xs4all.nl>
+
+	* Source/xlib/XGFont.m ([XGFontInfo -setupAttributes]): Use
+	ascender and descender informaton of the X11 font instead of using
+	maximum bounding box.
+
 2003-02-19  Adam Fedor  <fedor@gnu.org>
 
 	* Source/gsc/GSStreamContext.m (fpfloat): New function. Used everywhere
diff --git a/Source/xlib/XGFont.m b/Source/xlib/XGFont.m
index ef24012..f5617e9 100644
--- a/Source/xlib/XGFont.m
+++ b/Source/xlib/XGFont.m
@@ -298,10 +298,10 @@ static BOOL XGInitAtoms(Display *dpy)
   [fontDictionary setObject: familyName forKey: NSAFMFamilyName];
   isFixedPitch = XGFontIsFixedPitch(xdpy, font_info);
   isBaseFont = NO;
-  ascender = font_info->max_bounds.ascent;
+  ascender = font_info->ascent;
   [fontDictionary setObject: [NSNumber numberWithFloat: ascender] 
 		  forKey: NSAFMAscender];
-  descender = -(font_info->max_bounds.descent);
+  descender = -(font_info->descent);
   [fontDictionary setObject: [NSNumber numberWithFloat: descender]
 		  forKey: NSAFMDescender];
   fontBBox = NSMakeRect(