--- postfix-2.2.2/src/util/sys_defs.h.large-fs	2005-02-04 01:07:44.000000000 +0100
+++ postfix-2.2.2/src/util/sys_defs.h	2005-04-20 16:36:55.621279565 +0200
@@ -618,8 +618,8 @@
 #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
 #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
 #define FIONREAD_IN_TERMIOS_H
-#define USE_STATFS
-#define STATFS_IN_SYS_VFS_H
+#define USE_STATVFS
+#define STATVFS_IN_SYS_STATVFS_H
 #define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT
 #define PREPEND_PLUS_TO_OPTSTRING
 #define HAS_POSIX_REGEXP
--- postfix-2.2.2/src/util/fsspace.c.large-fs	1999-06-25 02:06:14.000000000 +0200
+++ postfix-2.2.2/src/util/fsspace.c	2005-04-20 16:53:28.777232112 +0200
@@ -38,6 +38,7 @@
 /*--*/
 
 /* System library. */
+#define _FILE_OFFSET_BITS 64
 
 #include <sys_defs.h>
 
@@ -91,8 +92,15 @@
 
     if (statvfs(path, &fsbuf) < 0)
 	msg_fatal("statvfs %s: %m", path);
-    sp->block_size = fsbuf.f_frsize;
-    sp->block_free = fsbuf.f_bavail;
+    if (fsbuf.f_frsize > 0)
+	sp->block_size = fsbuf.f_frsize;
+    else
+	sp->block_size = fsbuf.f_bsize;
+    /* 4G of FS blocks is surely enough space to put a mail in */
+    sp->block_free = 0;
+    sp->block_free = ~sp->block_free;
+    if (fsbuf.f_bavail < sp->block_free)
+	sp->block_free = fsbuf.f_bavail;
 #endif
     if (msg_verbose)
 	msg_info("%s: %s: block size %lu, blocks free %lu",