diff --git a/SystemTools.cxx b/SystemTools.cxx
index 16683a9f0565c53da6f171ac41e8bb7df0dba27b..96cde13b3e38e4f2bfa3d5d39674d0bced40a802 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -70,7 +70,6 @@
 #endif
 
 #ifdef __CYGWIN__
-# undef _WIN32
 extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
 #endif
 
@@ -2614,7 +2613,7 @@ bool SystemTools::FileIsDirectory(const char* name)
   struct stat fs;
   if(stat(name, &fs) == 0)
     {
-#if defined( _WIN32 )
+#if defined( _WIN32 ) && !defined(__CYGWIN__)
     return ((fs.st_mode & _S_IFDIR) != 0);
 #else
     return S_ISDIR(fs.st_mode);
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index b37b5d9ad54e7aeb12a3f2c681acab38630a4fed..2c7f6644e4785cd9040c6ac8dbbeac4d9434bf54 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 09)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   22)
+SET(KWSYS_DATE_STAMP_DAY   23)