diff --git a/hash_fun.hxx.in b/hash_fun.hxx.in
index f21efc54f2a8367c7c1564a04ddd6e51815a4308..9a9cf47d967f0db7c50a07dc76615e4a556905da 100644
--- a/hash_fun.hxx.in
+++ b/hash_fun.hxx.in
@@ -38,7 +38,7 @@
 #define @KWSYS_NAMESPACE@_hash_fun_hxx
 
 #include <@KWSYS_NAMESPACE@/Configure.hxx>
-
+#include <@KWSYS_NAMESPACE@/FundamentalType.h>
 #include <@KWSYS_NAMESPACE@/cstddef>        // size_t
 
 namespace @KWSYS_NAMESPACE@
@@ -110,6 +110,29 @@ struct hash<unsigned long> {
   size_t operator()(unsigned long __x) const { return __x; }
 };
 
+#if @KWSYS_NAMESPACE@_USE_LONG_LONG
+@KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<long long> {
+  size_t operator()(long long __x) const { return __x; }
+};
+
+@KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<unsigned long long> {
+  size_t operator()(unsigned long long __x) const { return __x; }
+};
+#endif
+
+#if @KWSYS_NAMESPACE@_USE___INT64
+@KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<__int64> {
+  size_t operator()(__int64 __x) const { return __x; }
+};
+@KWSYS_NAMESPACE@_CXX_DEFINE_SPECIALIZATION
+struct hash<unsigned __int64> {
+  size_t operator()(unsigned __int64 __x) const { return __x; }
+};
+#endif
+
 } // namespace @KWSYS_NAMESPACE@
 
 #endif
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 23308ff1e604f652a41f0b29cd8abb10d8b59fbf..eb1ed8a985df30a5f17235a81c47dd241bdea811 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   04)
+SET(KWSYS_DATE_STAMP_DAY   08)