diff --git a/ChangeLog b/ChangeLog
index 53656e2..87a3f1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-30  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/xlib/XGContext.m  (+initializeBackend): Use anti-aliaesd
+	fonts when available and not specified otherwise.
+	* Documentation/Back/DefaultsSummary.gsdoc: Document that AA fonts
+	are now the default for xlib.
+
 2004-09-28  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/x11/XGServerEvent.m (initialize_keyboard): Corrected typo
diff --git a/Documentation/Back/DefaultsSummary.gsdoc b/Documentation/Back/DefaultsSummary.gsdoc
index 7e3eb19..13c5149 100644
--- a/Documentation/Back/DefaultsSummary.gsdoc
+++ b/Documentation/Back/DefaultsSummary.gsdoc
@@ -61,10 +61,11 @@
 	  <desc>
           <p>
           With the xlib backend, this is a boolean value which
-          defaults to <code>NO</code>. If set to
+          defaults to <code>YES</code>. If set to
           <code>YES</code> and X Windows system has the XFT
           extension, then the application will use anti-aliased fonts
-          as provided by XFT..
+          as provided by XFT. If set to <code>NO</code> anti-aliased fonts
+	  will not be used even when available.
           </p>
 	  <p> With the art backend, A boolean value which defaults to
 	  YES. If YES, text is anti-aliased at small sizes (9-16
diff --git a/Source/xlib/XGContext.m b/Source/xlib/XGContext.m
index 25af357..2681bfa 100644
--- a/Source/xlib/XGContext.m
+++ b/Source/xlib/XGContext.m
@@ -73,13 +73,15 @@
   Class fontClass = Nil;
   Class fontEnumerator = Nil;
   BOOL  enableFontSet;
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
 
   NSDebugLog(@"Initializing GNUstep xlib backend.\n");
 
   [NSGraphicsContext setDefaultContextClass: [XGContext class]];
 
 #ifdef HAVE_XFT
-  if ([[NSUserDefaults standardUserDefaults] boolForKey: @"GSFontAntiAlias"])
+  if (([ud objectForKey: @"GSFontAntiAlias"] == nil) ||
+      ([ud boolForKey: @"GSFontAntiAlias"]))
     {
       fontClass = [GSXftFontInfo class];
 #ifdef HAVE_FC
@@ -87,8 +89,7 @@
 #endif
     }
 #endif
-  enableFontSet = [[NSUserDefaults standardUserDefaults] boolForKey:
-							   @"GSXEnableFontSet"];
+  enableFontSet = [ud boolForKey: @"GSXEnableFontSet"];
   if (fontClass == Nil)
     {
       if (enableFontSet == NO)