diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fc9a6016..55a4be11 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3008,6 +3008,9 @@ Torsten Lang <info@torstenlang.de>
  for suggesting to increase the size of the TS buffer to 5MB and that of the Recorder
  buffer to 20MB to better handle HD recordings
  for fixing setting the video format in the dvbhdffdevice
+ for reporting a problem with setting the system time from the TDT in case devices
+ are tuned to the same transponder on different sources, and these broadcast different
+ time data
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
diff --git a/HISTORY b/HISTORY
index 0c39a4fc..cbdd3323 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7832,7 +7832,7 @@ Video Disk Recorder Revision History
 - Fixed cleaning up old EPG events in case no epg data file is given (reported by
   Dave Pickles).
 
-2013-10-11: Version 2.0.4
+2013-10-12: Version 2.0.4
 
 - Unified the internal sequence of actions when pressing the Blue and the Back key,
   respectively, during replay (reported by Thomas Maass).
@@ -7840,3 +7840,7 @@ Video Disk Recorder Revision History
   is set to "do not pause live video" (suggested by Ulf Kiener).
 - Fixed writing group separators to channels.conf that contain a comma (reported by
   Eike Edener).
+- Now also checking the source (in addition to the transponder) when setting the
+  system time from the TDT, which avoids problems in case devices are tuned to the
+  same transponder on different sources, and these broadcast different time data
+  (reported by Torsten Lang).
diff --git a/eit.c b/eit.c
index 73c4fa9b..5ebbfc4e 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 2.23 2012/12/04 11:10:10 kls Exp $
+ * $Id: eit.c 2.23.1.1 2013/10/12 11:24:51 kls Exp $
  */
 
 #include "eit.h"
@@ -404,7 +404,7 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
          }
          break;
     case 0x14: {
-         if (Setup.SetSystemTime && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
+         if (Setup.SetSystemTime && Setup.TimeSource == Source() && Setup.TimeTransponder && ISTRANSPONDER(Transponder(), Setup.TimeTransponder))
             cTDT TDT(Data);
          }
          break;