diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index b28508e67c4..e18725d9740 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1447,6 +1447,11 @@ AC_SUBST(LLVM_INFODIR)
 AC_SUBST(LLVM_MANDIR)
 AC_SUBST(LLVM_CONFIGTIME)
 
+dnl Disable embedding timestamps in the build directory, with ENABLE_TIMESTAMPS.
+if test "${ENABLE_TIMESTAMPS}" = "0"; then
+  LLVM_CONFIGTIME="(timestamp not enabled)"
+fi
+
 dnl Place the various directories into the config.h file as #defines so that we
 dnl can know about the installation paths within LLVM.
 AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX",
diff --git a/configure b/configure
index a65e9e4d946..a6ed7a1930a 100755
--- a/configure
+++ b/configure
@@ -20820,6 +20820,10 @@ LLVM_CONFIGTIME=`date`
 
 
 
+if test "${ENABLE_TIMESTAMPS}" = "0"; then
+  LLVM_CONFIGTIME="(timestamp not enabled)"
+fi
+
 
 cat >>confdefs.h <<_ACEOF
 #define LLVM_PREFIX "$LLVM_PREFIX"