diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83c342cd7..f4f25f756 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@ SET( TOMAHAWK_VERSION_PATCH 0 )
 
 IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
   # Use the date as the tweak level.
-  INCLUDE( ${CMAKE_MODULE_PATH}/kwsysDateStamp.cmake )
-  SET( TOMAHAWK_VERSION_TWEAK "${KWSYS_DATE_STAMP_YEAR}${KWSYS_DATE_STAMP_MONTH}${KWSYS_DATE_STAMP_DAY}" )
+  INCLUDE( ${CMAKE_MODULE_PATH}/CMakeDateStamp.cmake )
+  SET( TOMAHAWK_VERSION_TWEAK "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
   INCLUDE( ${CMAKE_MODULE_PATH}/CMakeVersionSource.cmake )
 ENDIF()
 
diff --git a/CMakeModules/CMakeDateStamp.cmake b/CMakeModules/CMakeDateStamp.cmake
new file mode 100644
index 000000000..f88db2edb
--- /dev/null
+++ b/CMakeModules/CMakeDateStamp.cmake
@@ -0,0 +1,23 @@
+find_program(DATE_EXECUTABLE NAMES date)
+mark_as_advanced(DATE_EXECUTABLE)
+
+if(GIT_EXECUTABLE)
+  execute_process(
+    COMMAND ${DATE_EXECUTABLE} +%Y
+    OUTPUT_VARIABLE CMAKE_DATESTAMP_YEAR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+  execute_process(
+    COMMAND ${DATE_EXECUTABLE} +%m
+    OUTPUT_VARIABLE CMAKE_DATESTAMP_MONTH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+  execute_process(
+    COMMAND ${DATE_EXECUTABLE} +%d
+    OUTPUT_VARIABLE CMAKE_DATESTAMP_DAY
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+endif()
diff --git a/CMakeModules/kwsysDateStamp.cmake b/CMakeModules/kwsysDateStamp.cmake
deleted file mode 100644
index f17c56cec..000000000
--- a/CMakeModules/kwsysDateStamp.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Do not edit!  Generated by kwsysDateStamp.py
-#=============================================================================
-# KWSys - Kitware System Library
-# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# KWSys version date year component.  Format is CCYY.
-SET(KWSYS_DATE_STAMP_YEAR  2011)
-
-# KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 07)
-
-# KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   06)