diff --git a/ChangeLog b/ChangeLog
index a668f2b3f..87097e2d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add a check for structfs.f_bavail
+
 2008-07-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gmain.c (g_get_current_time): Add a g_return_val_if_fail
diff --git a/configure.in b/configure.in
index d5a7044e8..ac6db4b28 100644
--- a/configure.in
+++ b/configure.in
@@ -831,7 +831,7 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h f
 
 # check for structure fields
 AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename],,, [#include <sys/types.h>
+AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_PARAM_H
diff --git a/gio/ChangeLog b/gio/ChangeLog
index 126828d7b..723a216a9 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	536733 – gio build failure on Irix
+
+	* glocalfile.c: Use a configure check for structfs.f_bavail.
+
 2008-07-02  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 534639 – add g_desktop_app_info_new_from_keyfile
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index e0bee8d8e..634a38a21 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -53,8 +53,8 @@
 #if defined(HAVE_STATFS) && defined(HAVE_STATVFS)
 /* Some systems have both statfs and statvfs, pick the
    most "native" for these */
-# if defined(sun) && defined(__SVR4)
-   /* on solaris, statfs doesn't even have the
+# if !defined(HAVE_STRUCT_STATFS_F_BAVAIL)
+   /* on solaris and irix, statfs doesn't even have the
       f_bavail field */
 #  define USE_STATVFS
 # else