diff --git a/configure b/configure
index a9eed6b394..f2bdf77030 100755
--- a/configure
+++ b/configure
@@ -11092,6 +11092,11 @@ rm -rf conftest*
 
 fi
 
+   # Autoconf 2.69's AC_SYS_LARGEFILE believes it's a good idea to #define
+   # _DARWIN_USE_64_BIT_INODE, but it isn't: on OS X 10.5 that activates a
+   # bug that causes readdir() to sometimes return EINVAL.  On later OS X
+   # versions where the feature actually works, it's on by default anyway.
+
 fi
 
 # Check for largefile support (must be after AC_SYS_LARGEFILE)
diff --git a/configure.in b/configure.in
index fbe2d40292..832b3a3458 100644
--- a/configure.in
+++ b/configure.in
@@ -1205,6 +1205,11 @@ esac
 # defines can affect what is generated for that.
 if test "$PORTNAME" != "win32"; then
    AC_SYS_LARGEFILE
+   # Autoconf 2.69's AC_SYS_LARGEFILE believes it's a good idea to #define
+   # _DARWIN_USE_64_BIT_INODE, but it isn't: on OS X 10.5 that activates a
+   # bug that causes readdir() to sometimes return EINVAL.  On later OS X
+   # versions where the feature actually works, it's on by default anyway.
+   AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],[])
 fi
 
 # Check for largefile support (must be after AC_SYS_LARGEFILE)
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 3ed286f36c..64717dfcd4 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -833,10 +833,7 @@
    XLOG_BLCKSZ). Changing XLOG_SEG_SIZE requires an initdb. */
 #undef XLOG_SEG_SIZE
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
+
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS