diff --git a/ChangeLog b/ChangeLog
index c0582c88b..3929ffe9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-21 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSBitmapImageRep+ICNS.m: Redefine icns_size_t to int, as
+	this needs to be a 32 bit integer and on 64 bit systems long uses
+	64 bits.
+
 2009-08-19 00:57-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSTextView.m: Don't add the text storage if it's nil
diff --git a/Source/NSBitmapImageRep+ICNS.m b/Source/NSBitmapImageRep+ICNS.m
index 548d761e0..3af69263d 100644
--- a/Source/NSBitmapImageRep+ICNS.m
+++ b/Source/NSBitmapImageRep+ICNS.m
@@ -55,7 +55,8 @@
  */
 
 typedef unsigned char icns_byte_t;
-typedef unsigned long icns_size_t;
+// must be a 32 bit integer
+typedef unsigned int icns_size_t;
 typedef struct _icns_type_t {
   char c[4];
 } icns_type_t;