diff --git a/ChangeLog b/ChangeLog
index dd8400f51..3e6a2f958 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-09  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/win32/NSMessagePortNameServer.m: Fix GC error on windows
+	as reported by Ly Liyi
+
 2009-02-09  Matt Rice  <ratmice@gmail.com>
 
 	* Headers/Foundation/NSZone.h (GSMakeWeakPointer): Rename class
diff --git a/Source/win32/NSMessagePortNameServer.m b/Source/win32/NSMessagePortNameServer.m
index 09a5e899c..f33dcaeab 100644
--- a/Source/win32/NSMessagePortNameServer.m
+++ b/Source/win32/NSMessagePortNameServer.m
@@ -76,7 +76,7 @@ static void clean_up_names(void)
       [defaultServer removePort: port];
     }
   NSEndMapTableEnumeration(&mEnum);
-  DESTROY(arp);
+  IF_NO_GC([arp release]);
   RegCloseKey(key);
   if (unknownThread == YES)
     {