diff --git a/hash_fun.hxx.in b/hash_fun.hxx.in
index 9a9cf47d967f0db7c50a07dc76615e4a556905da..926ec92be88c6368bcfc919e34e5fc5351b81894 100644
--- a/hash_fun.hxx.in
+++ b/hash_fun.hxx.in
@@ -110,6 +110,7 @@ struct hash<unsigned long> {
   size_t operator()(unsigned long __x) const { return __x; }
 };
 
+// use long long or __int64
 #if @KWSYS_NAMESPACE@_USE_LONG_LONG
 @KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
 struct hash<long long> {
@@ -120,9 +121,7 @@ struct hash<long long> {
 struct hash<unsigned long long> {
   size_t operator()(unsigned long long __x) const { return __x; }
 };
-#endif
-
-#if @KWSYS_NAMESPACE@_USE___INT64
+#elif @KWSYS_NAMESPACE@_USE___INT64
 @KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
 struct hash<__int64> {
   size_t operator()(__int64 __x) const { return __x; }
@@ -131,7 +130,7 @@ struct hash<__int64> {
 struct hash<unsigned __int64> {
   size_t operator()(unsigned __int64 __x) const { return __x; }
 };
-#endif
+#endif // use long long or __int64
 
 } // namespace @KWSYS_NAMESPACE@
 
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index eb1ed8a985df30a5f17235a81c47dd241bdea811..e7f3f3a0e77499bf00b2211cd2d9ea0d2fde1ae6 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2011)
 SET(KWSYS_DATE_STAMP_MONTH 08)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   08)
+SET(KWSYS_DATE_STAMP_DAY   09)