diff --git a/ChangeLog b/ChangeLog
index 28e17c4c5..8c974f1d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-18  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Bug 522292 - Gives warnings in glib/gutils.h with GCC in C99 mode
+
+	* glib/gutils.h: Use "__attribute__ ((__gnu_inline__))" for inlining
+	if either __GNUC_STDC_INLINE__ or __GNUC_GNU_INLINE__ are defined. In
+	gcc version prior to 4.3 no correct C99-inline was implemented which
+	has semantic differences to GNU inline.
+
 2008-03-14  Alexander Larsson  <alexl@redhat.com>
 
         * configure.in:
diff --git a/glib/gutils.h b/glib/gutils.h
index 4b72589a3..7685809f5 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -97,7 +97,7 @@ G_BEGIN_DECLS
 #  define G_INLINE_FUNC
 #  undef  G_CAN_INLINE
 #elif defined (__GNUC__) 
-#  ifdef __GNUC_STDC_INLINE__
+#  if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
 #   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
 #  else
 #   define G_INLINE_FUNC extern inline