diff --git a/ChangeLog b/ChangeLog
index 9e061a8d3..5dfa6a0eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22 17:15-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/NSObject.m: Conditionally compile weak attribute for
+	Windows since it is not supported by the win32 linker.
+
 2009-12-20 David Chisnall <theraven@gna.org>
 
 	* Source/NSObject.m: Set block superclass.
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 5dd5aea08..483fc5b54 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -896,15 +896,19 @@ GSGarbageCollectorLog(char *msg, GC_word arg)
  * Semi-private function in libobjc2 that initialises the classes used for
  * blocks.
  */
+#ifndef __MINGW32__
 BOOL 
 objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
+#endif
 
 + (void)load
 {
+#ifndef __MINGW32__
   /* When NSObject is loaded, register it as the superclass of the block
    * classes */
   if (objc_create_block_classes_as_subclasses_of)
     objc_create_block_classes_as_subclasses_of(self);
+#endif
 }
 
 /**