diff --git a/ChangeLog b/ChangeLog
index 977e096fa..8db5ca42c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-06 22:53  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSFont.m (getNSFont): Set the explicit-size bit in the
+	role correctly.
+
 2003-09-06  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Images/common_Printer.tiff 
diff --git a/Source/NSFont.m b/Source/NSFont.m
index 102549a62..3e354c58b 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -280,8 +280,6 @@ static NSFont *getNSFont(float fontSize, int role)
   defaultSize = (fontSize == 0.0);
   if (defaultSize)
     {
-      font_role |= 1;
-
       if (font_roles[role].cachedFont)
 	return AUTORELEASE(RETAIN(font_roles[role].cachedFont));
 
@@ -291,6 +289,10 @@ static NSFont *getNSFont(float fontSize, int role)
       if (!fontSize)
 	fontSize = [NSFont systemFontSize];
     }
+  else
+    {
+      font_role |= 1;
+    }
 
   fontName = fontNameForRole(role, &i);
   font = [NSFontClass _fontWithName: fontName