diff --git a/SystemTools.cxx b/SystemTools.cxx
index ed7f62c0a3873068e05789681391e2bd4e12ad3a..4d83293d9787fa11983488649821b560fff8c959 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -326,7 +326,7 @@ void SystemTools::GetPath(kwsys_stl::vector<kwsys_stl::string>& path, const char
   kwsys_stl::string pathEnv = cpathEnv;
 
   // A hack to make the below algorithm work.
-  if(pathEnv[pathEnv.length()-1] != ':')
+  if(!pathEnv.empty() && pathEnv[pathEnv.length()-1] != pathSep[0])
     {
     pathEnv += pathSep;
     }
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 36edd5332093c98a65c8bea356310a3ef513b0ae..a60594a4d6322490b44ae69e101e8679c6455646 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -15,7 +15,7 @@
 SET(KWSYS_DATE_STAMP_YEAR  2011)
 
 # KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 11)
+SET(KWSYS_DATE_STAMP_MONTH 12)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   13)
+SET(KWSYS_DATE_STAMP_DAY   15)