diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 976e43c4..e9438809 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -595,6 +595,8 @@ Helmut Auer <vdr@helmutauer.de>
  not two hex digits after the '#'
  for suggesting to suppress the automatic shutdown if the remote control is
  currently disabled
+ for suggesting to improve logging system time changes to avoid problems on slow
+ systems under heavy load
 
 Jeremy Hall <jhall@UU.NET>
  for fixing an incomplete initialization of the filter parameters in eit.c
diff --git a/HISTORY b/HISTORY
index d1ae9320..2424c971 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5730,7 +5730,7 @@ Video Disk Recorder Revision History
 - Updated the Portuguese language texts.
 - Added a note about VDR_CHARSET_OVERRIDE to the INSTALL file.
 
-2008-04-12: Version 1.7.0
+2008-04-13: Version 1.7.0
 
 - Re-implemented handling of DVB-S2, which first appeared in version 1.5.14, but was
   revoked in version 1.5.15 in favor of making a stable version 1.6.0. VDR now
@@ -5741,6 +5741,8 @@ Video Disk Recorder Revision History
 - Fixed displaying transponder data when it is modified (thanks to Reinhard Nissl).
 - Fixed handling the counter in detection of pre 1.3.19 PS data (thanks to Reinhard
   Nissl).
+- Improved logging system time changes to avoid problems on slow systems under
+  heavy load (suggested by Helmut Auer).
 
 2008-04-13: Version 1.6.0-1
 
diff --git a/eit.c b/eit.c
index b38e3a8a..d32629ef 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.126 2007/09/26 10:56:33 kls Exp $
+ * $Id: eit.c 2.1 2008/04/13 11:27:06 kls Exp $
  */
 
 #include "eit.h"
@@ -300,9 +300,9 @@ cTDT::cTDT(const u_char *Data)
   if (diff > 2) {
      mutex.Lock();
      if (abs(diff - lastDiff) < 3) {
-        isyslog("System Time = %s (%ld)", *TimeToString(loctim), loctim);
-        isyslog("Local Time  = %s (%ld)", *TimeToString(sattim), sattim);
-        if (stime(&sattim) < 0)
+        if (stime(&sattim) == 0)
+           isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(sattim), sattim);
+        else
            esyslog("ERROR while setting system time: %m");
         }
      lastDiff = diff;