diff --git a/ChangeLog b/ChangeLog
index 3a93ae589..7d7fbbf2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-20  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSConnection.m:
+	* Source/NSDistributedNotificationCenter.m:
+	mingw tweaks
+
 2005-04-19  Adam Fedor  <fedor@gnu.org>
 
 	* Tools/gdomap.c (init_iface): Round size to make sure we don't violate
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 4d4362333..54a00459b 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -1015,12 +1015,15 @@ static NSLock	*cached_proxies_gate = nil;
   /*
    * Make sure we are not registered.
    */
+#ifndef	__MINGW__
   if ([_receivePort isKindOfClass: [NSMessagePort class]])
     {
       [self registerName: nil
 	  withNameServer: [NSMessagePortNameServer sharedInstance]];
     }
-  else if ([_receivePort isKindOfClass: [NSSocketPort class]])
+  else
+#endif
+  if ([_receivePort isKindOfClass: [NSSocketPort class]])
     {
       [self registerName: nil
 	  withNameServer: [NSSocketPortNameServer sharedInstance]];
diff --git a/Source/NSDistributedNotificationCenter.m b/Source/NSDistributedNotificationCenter.m
index 6c617ae14..8d9dce1e9 100644
--- a/Source/NSDistributedNotificationCenter.m
+++ b/Source/NSDistributedNotificationCenter.m
@@ -589,7 +589,7 @@ static NSDistributedNotificationCenter	*netCenter = nil;
 	{
 	  ASSIGN(_type, GSPublicNotificationCenterType);
 	}
-#endif
+#else
       if (_type == NSLocalNotificationCenterType)
 	{
 	  host = @"";
@@ -597,7 +597,9 @@ static NSDistributedNotificationCenter	*netCenter = nil;
 	  service = GDNC_SERVICE;
 	  description = @"local host";
 	}
-      else if (_type == GSPublicNotificationCenterType)
+      else
+#endif
+      if (_type == GSPublicNotificationCenterType)
         {
 	  /*
 	   * Connect to the NSDistributedNotificationCenter for this host.