diff --git a/ChangeLog b/ChangeLog
index 4895a2d1e..a957bcf1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Merge from trunk
+
+	* configure.in: Fix detection of struct statfs fields.
+
 2008-08-31  Emmanuele Bassi  <ebassi@gnome.org>
 
 	* glib/gbookmarkfile.c:
diff --git a/configure.in b/configure.in
index 6ca88983f..58ba2a0c8 100644
--- a/configure.in
+++ b/configure.in
@@ -857,6 +857,7 @@ AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct
 AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename],,, [#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <sys/statfs.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif