diff --git a/ChangeLog b/ChangeLog
index cfdeec5..3199b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-01  Adam Fedor  <fedor@gnu.org>
+
+	* Source/win32/WIN32Server.m: Re-add 2005-02-23 change.
+
+	* Source/xlib/GSXftFontInfo.m (-setupAttributes): Make log message
+	more verbose.
+
 2005-04-01 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/x11/XGDragView.m: Complete code changes to factor out as
@@ -9,7 +16,7 @@
 
 	* Headers/x11/XGDragView.h, Source/x11/XGDragView.m: Tag previous 
 	version of file for release.
-	* Source/win32/WIN32Server.m: Revert 2005-2-23 change for this release.
+	* Source/win32/WIN32Server.m: Revert 2005-02-23 change for this release.
 
 2005-03-29 Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Documentation/announce.texi b/Documentation/announce.texi
index 14cf7f5..fb76fc9 100644
--- a/Documentation/announce.texi
+++ b/Documentation/announce.texi
@@ -31,8 +31,7 @@ emulate the DPS functions required by the front-end system.
 
 @ifset GNUSTEP-BACK-FTP-MACHINE
 The gstep-back-@value{GNUSTEP-BACK-VERSION}.tar.gz distribution
-file has been placed on @samp{@value{GNUSTEP-BACK-FTP-MACHINE}} in
-@samp{@value{GNUSTEP-BACK-FTP-DIRECTORY}}.
+file has been placed at @url{ftp://@value{GNUSTEP-BACK-FTP-MACHINE}/@value{GNUSTEP-BACK-FTP-DIRECTORY}}.
 @end ifset
 
 @section Where do I send bug reports?
diff --git a/Source/win32/WIN32Server.m b/Source/win32/WIN32Server.m
index c923761..ee68356 100644
--- a/Source/win32/WIN32Server.m
+++ b/Source/win32/WIN32Server.m
@@ -125,7 +125,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
                   watcher: (id<RunLoopEvents>)self
                   forMode: mode];
 #else 
-  // FIXME
+#if 0
   NSTimer *timer;
 
   timer = [NSTimer timerWithTimeInterval: 0.01
@@ -134,6 +134,11 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
 		   userInfo: nil
 		   repeats: YES];
   [[NSRunLoop currentRunLoop] addTimer: timer forMode: mode];
+#else
+  [[NSRunLoop currentRunLoop] addMsgTarget: self
+				withMethod: @selector(callback:)
+				   forMode: mode];
+#endif
 #endif
 }
 
diff --git a/Source/xlib/GSXftFontInfo.m b/Source/xlib/GSXftFontInfo.m
index 379667d..7685cb9 100644
--- a/Source/xlib/GSXftFontInfo.m
+++ b/Source/xlib/GSXftFontInfo.m
@@ -682,7 +682,7 @@ static NSArray *faFromFc(FcPattern *pat)
   if ((xfontname == nil) ||
       (font_info = XftFontOpenXlfd(xdpy, defaultScreen, [xfontname UTF8String])) == NULL)
     {
-      NSLog(@"Unable to open fixed font");
+      NSLog(@"Unable to open fixed font %@", xfontname);
       return NO;
     }
   else