diff --git a/clamav-disable-timestamps.patch b/clamav-disable-timestamps.patch
new file mode 100644
index 0000000..1210b39
--- /dev/null
+++ b/clamav-disable-timestamps.patch
@@ -0,0 +1,85 @@
+Index: clamav-0.99.2/libclamav/tomsfastmath/misc/fp_ident.c
+===================================================================
+--- clamav-0.99.2.orig/libclamav/tomsfastmath/misc/fp_ident.c
++++ clamav-0.99.2/libclamav/tomsfastmath/misc/fp_ident.c
+@@ -15,7 +15,11 @@ const char *fp_ident(void)
+ 
+    memset(buf, 0, sizeof(buf));
+    snprintf(buf, sizeof(buf)-1,
+-"TomsFastMath (%s)\n"
++#if (ENABLE_TIMESTAMPS == 1)
++	"TomsFastMath (%s)\n"
++#else
++	"TomsFastMath\n"
++#endif
+ "\n"
+ "Sizeofs\n"
+ "\tfp_digit = %llu\n"
+@@ -70,7 +74,11 @@ const char *fp_ident(void)
+ #ifdef TFM_HUGE
+ " TFM_HUGE "
+ #endif
++#if (ENABLE_TIMESTAMPS == 1)
+             "\n", __DATE__, (long long unsigned)sizeof(fp_digit), (long long unsigned)sizeof(fp_word), FP_MAX_SIZE);
++#else
++            "\n", (long long unsigned)sizeof(fp_digit), (long long unsigned)sizeof(fp_word), FP_MAX_SIZE);
++#endif
+ 
+    if (sizeof(fp_digit) == sizeof(fp_word)) {
+       strncat(buf, "WARNING: sizeof(fp_digit) == sizeof(fp_word), this build is likely to not work properly.\n", 
+Index: clamav-0.99.2/configure
+===================================================================
+--- clamav-0.99.2.orig/configure
++++ clamav-0.99.2/configure
+@@ -783,6 +783,7 @@ FGREP
+ SED
+ LIBTOOL
+ LIBCLAMAV_VERSION
++ENABLE_TIMESTAMPS
+ EGREP
+ GREP
+ CPP
+@@ -885,6 +886,7 @@ ac_user_opts='
+ enable_option_checking
+ enable_silent_rules
+ enable_dependency_tracking
++enable_timestamps
+ enable_static
+ enable_shared
+ with_pic
+@@ -1592,6 +1594,8 @@ Optional Features:
+                           do not reject slow dependency extractors
+   --disable-dependency-tracking
+                           speeds up one-time build
++  --enable-timestamps     Enable embedding timestamp information in build
++                          (default is YES)
+   --enable-static[=PKGS]  build static libraries [default=no]
+   --enable-shared[=PKGS]  build shared libraries [default=yes]
+   --enable-fast-install[=PKGS]
+@@ -5163,6 +5167,26 @@ $as_echo "$ac_cv_safe_to_define___extens
+ 
+   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+ 
++# Check whether --enable-timestamps was given.
++if test "${enable_timestamps+set}" = set; then :
++  enableval=$enable_timestamps;
++else
++  enableval=default
++fi
++
++case "$enableval" in
++  yes) ENABLE_TIMESTAMPS=1
++ ;;
++  no)  ENABLE_TIMESTAMPS=0
++ ;;
++  default) ENABLE_TIMESTAMPS=1
++ ;;
++  *) as_fn_error $? "Invalid setting for --enable-timestamps. Use \"yes\" or \"no\"" "$LINENO" 5 ;;
++esac
++
++cat >>confdefs.h <<_ACEOF
++#define ENABLE_TIMESTAMPS $ENABLE_TIMESTAMPS
++_ACEOF
+ 
+ 
+ VERSION="0.99.2"
diff --git a/clamav.changes b/clamav.changes
index d823fc6..cad9185 100644
--- a/clamav.changes
+++ b/clamav.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 13 07:56:56 UTC 2016 - fweiss@suse.com
+
+- Add enable-timestamps option to disable time
+  dependent macros if passed to configure (bsc#1001154)
+
 -------------------------------------------------------------------
 Wed Aug  3 08:46:11 UTC 2016 - max@suse.com
 
diff --git a/clamav.spec b/clamav.spec
index 5580cbe..39a7495 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -55,6 +55,7 @@ Source8:        service.freshclam
 Source9:        service.clamav-milter
 Patch1:         clamav-conf.patch
 Patch3:         clamav-gcc47.patch
+Patch4:         clamav-disable-timestamps.patch
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
 %systemd_requires
@@ -73,6 +74,7 @@ detecting threats.
 %setup -q
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CFLAGS="-fstack-protector"