diff --git a/CMakeLists.txt b/CMakeLists.txt
index 145e43a49d8c5a0d32f2ecc7be937eea6e572e58..92ac20f73b51bbfbcf8194549cb97202523ffd2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,14 +337,19 @@ ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 
 #-----------------------------------------------------------------------------
 # Configure Large File Support.
+KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_CSTDIO
+  "Checking whether header cstdio is available" DIRECT)
 SET(KWSYS_LFS_AVAILABLE 0)
 IF(KWSYS_LFS_REQUESTED)
   # Large File Support is requested.
   SET(KWSYS_LFS_REQUESTED 1)
 
   # Check for large file support.
+  SET(KWSYS_PLATFORM_CXX_TEST_DEFINES
+    -DKWSYS_CXX_HAS_CSTDIO=${KWSYS_CXX_HAS_CSTDIO})
   KWSYS_PLATFORM_CXX_TEST_RUN(KWSYS_LFS_WORKS
     "Checking for Large File Support" DIRECT)
+  SET(KWSYS_PLATFORM_CXX_TEST_DEFINES)
 
   IF(KWSYS_LFS_WORKS)
     SET(KWSYS_LFS_AVAILABLE 1)
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 0382f078fef3bd43303bab3eb55a6195e3b383e6..54ed2d47634583d5160fe13246ea9bdb4db28a6e 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 07)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   26)
+SET(KWSYS_DATE_STAMP_DAY   27)
diff --git a/kwsysPlatformTestsCXX.cxx b/kwsysPlatformTestsCXX.cxx
index f0a2dfccbcfe84f6d5a9f8a44fbe3578980cc78a..3d5550dd600f2adae6355d5036ee15d6d722e330 100644
--- a/kwsysPlatformTestsCXX.cxx
+++ b/kwsysPlatformTestsCXX.cxx
@@ -91,6 +91,11 @@ bool f(const kwsys_stl::string& s) { return s != ""; }
 int main() { return 0; }
 #endif
 
+#ifdef TEST_KWSYS_CXX_HAS_CSTDIO
+#include <cstdio>
+int main() { return 0; }
+#endif
+
 #ifdef TEST_KWSYS_CXX_HAS_CSTDDEF
 #include <cstddef>
 void f(size_t) {}
@@ -331,6 +336,9 @@ int main()
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
+#if KWSYS_CXX_HAS_CSTDIO
+# include <cstdio>
+#endif
 #include <stdio.h>
 
 int main(int, char **argv)