diff --git a/ChangeLog b/ChangeLog
index bba4fa92c..ce645c01f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Make the size_t size detection work on AIX. 
+	(#309725)
+
 2005-07-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Require a newer gtk-doc.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bba4fa92c..ce645c01f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Make the size_t size detection work on AIX. 
+	(#309725)
+
 2005-07-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Require a newer gtk-doc.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index bba4fa92c..ce645c01f 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Make the size_t size detection work on AIX. 
+	(#309725)
+
 2005-07-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Require a newer gtk-doc.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bba4fa92c..ce645c01f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Make the size_t size detection work on AIX. 
+	(#309725)
+
 2005-07-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Require a newer gtk-doc.
diff --git a/configure.in b/configure.in
index 1a8a95be8..1b7bf3475 100644
--- a/configure.in
+++ b/configure.in
@@ -787,6 +787,9 @@ dnl
 if test $ac_cv_sizeof_size_t = $ac_cv_sizeof_int &&
    test $ac_cv_sizeof_size_t = $ac_cv_sizeof_long ; then
   GLIB_CHECK_COMPILE_WARNINGS([
+#ifdef _AIX
+#pragma options langlvl=stdc89
+#endif
 #include <stddef.h> 
 int main ()
 {
@@ -796,6 +799,9 @@ int main ()
 }
     ],glib_size_type=int,
       [GLIB_CHECK_COMPILE_WARNINGS([
+#ifdef _AIX
+#pragma options langlvl=stdc89
+#endif
 #include <stddef.h> 
 int main ()
 {