diff --git a/ChangeLog b/ChangeLog
index 61e6532a3..762582462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 567838 – G_STRUCT_OFFSETOF fails to compile under icc 9.1
+
+	* glib/gmacros.h (G_STRUCT_OFFSETOF): Use offsetof instead of 
+	__builtin_offsetof, for icc's sake. Proposed by Hrvoje Niksic.
+
 2009-01-13  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 564728 Add function to decode base64 encoded data in place
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 356db119a..b3ff7ee3a 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -216,7 +216,7 @@
 
 #if defined(__GNUC__)  && __GNUC__ >= 4
 #  define G_STRUCT_OFFSET(struct_type, member) \
-      ((glong) __builtin_offsetof (struct_type, member))
+      ((glong) offsetof (struct_type, member))
 #else
 #  define G_STRUCT_OFFSET(struct_type, member)	\
       ((glong) ((guint8*) &((struct_type*) 0)->member))