diff --git a/SystemTools.cxx b/SystemTools.cxx
index 555434a5de1005d645058a77bb27dbaaf557d7ad..65f220638d1df89f63792abf9d8ff8e5d5e2a67a 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3975,12 +3975,18 @@ bool SystemTools::SetPermissions(const char* file, mode_t mode)
 
 kwsys_stl::string SystemTools::GetParentDirectory(const char* fileOrDir)
 {
-  if ( !fileOrDir || !*fileOrDir )
+  if ( !fileOrDir || !*fileOrDir || !SystemTools::FileExists(fileOrDir))
     {
     return "";
     }
   kwsys_stl::string res = fileOrDir;
   SystemTools::ConvertToUnixSlashes(res);
+  
+  // If the root "/" directory is passed in, return empty string
+  if(strcmp(res.c_str(), "/") ==0 )
+    {
+    return "";
+    }
   kwsys_stl::string::size_type cc = res.size()-1;
   if ( res[cc] == '/' )
     {
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 5a362e619a1916c4a3d628ecb7b6fe7194f662d9..21aeaab9f2ed06069609115e5fca6e1616bd3fdf 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 04)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   14)
+SET(KWSYS_DATE_STAMP_DAY   15)