diff --git a/ChangeLog b/ChangeLog
index 5dd937722..7457d4316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-009-06-09 Richard Frith-Macdonald <rfm@gnu.org>
+2009-06-13 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Foundation/NSKeyedArchiver.h:
+	* Headers/Foundation/NSArchiver.h:
+	Fix error cleaning up a define.
+
+2009-06-09 Richard Frith-Macdonald <rfm@gnu.org>
 
         * SSL/Source/GSSSLHandle.m: Disable v2 by default due to
         security issues.  GSPermitSSLv2 user default can enable it again.
diff --git a/Headers/Foundation/NSArchiver.h b/Headers/Foundation/NSArchiver.h
index 234540cfb..de7db5857 100644
--- a/Headers/Foundation/NSArchiver.h
+++ b/Headers/Foundation/NSArchiver.h
@@ -164,7 +164,7 @@ extern "C" {
   GSIArray		objMap;		/* Object crossreference map.	*/
   GSIArray		ptrMap;		/* Pointer crossreference map.	*/
 #ifndef	_IN_NSUNARCHIVER_M
-#undef	GSUnarchiverArray
+#undef	GSIArray
 #endif
   unsigned		cursor;		/* Position in data buffer.	*/
   unsigned		version;	/* Version of archiver used.	*/
diff --git a/Headers/Foundation/NSKeyedArchiver.h b/Headers/Foundation/NSKeyedArchiver.h
index 8c4df5559..1542ac566 100644
--- a/Headers/Foundation/NSKeyedArchiver.h
+++ b/Headers/Foundation/NSKeyedArchiver.h
@@ -230,7 +230,7 @@ extern "C" {
 #endif
   GSIArray		_objMap; /* Decoded objects.		*/
 #ifndef	_IN_NSKEYEDUNARCHIVER_M
-#undef	GSUnarchiverArray
+#undef	GSIArray
 #endif
   NSZone	*_zone;		/* Zone for allocating objs.	*/
 }