diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ba98b1e8..d88f0d48 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1303,6 +1303,8 @@ Mikko Salo <mikko.salo@ppe.inet.fi>
 
 Roman Krenický <free-rtk@gmx.de>
  for a patch that was used a a basis for changing a timer's day handling to full date
+ for considering the "EPG linger time" when saving the EPG data to file or listing
+ it via LSTE
 
 Ville Skyttä <ville.skytta@iki.fi>
  for reporting several compiler warnings in gcc 4.0
diff --git a/HISTORY b/HISTORY
index 71d0791d..9fdad9c0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3485,3 +3485,5 @@ Video Disk Recorder Revision History
   Matthias Lötzke).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Fixed handling transparent areas in cDvbSpuBitmap (thanks to Marco Schlüßler).
+- Now also considering the "EPG linger time" when saving the EPG data to file or
+  listing it via LSTE (thanks to Roman Krenický).
diff --git a/epg.c b/epg.c
index 9446073c..21bdeb5b 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.28 2005/05/05 12:37:15 kls Exp $
+ * $Id: epg.c 1.29 2005/05/05 13:53:19 kls Exp $
  */
 
 #include "epg.h"
@@ -223,7 +223,7 @@ cString cEvent::GetVpsString(void) const
 
 void cEvent::Dump(FILE *f, const char *Prefix) const
 {
-  if (startTime + duration >= time(NULL)) {
+  if (startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
      fprintf(f, "%sE %u %ld %d %X\n", Prefix, eventID, startTime, duration, tableID);
      if (!isempty(title))
         fprintf(f, "%sT %s\n", Prefix, title);