diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f2ab0839..4b9f40bf 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1767,3 +1767,7 @@ B
 Christoph Haubrich <christoph1.haubrich@arcor.de>
  for making the "Ok" key in the "Jump" mode of the replay progress display confirm
  the jump instead of closing the display
+
+Pekka Mauno <pekka.mauno@iki.fi>
+ for fixing cSchedule::GetFollowingEvent() in case there is currently no present
+ event running
diff --git a/HISTORY b/HISTORY
index c8f09224..2b6cb5b7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4412,3 +4412,5 @@ Video Disk Recorder Revision History
   (suggested by Matthias Schniedermeyer).
 - The DrawBitmap() function now has a new parameter 'Overlay' that allows a bitmap
   to be drawn with a transparent background (thanks to Alexander Hans).
+- Fixed cSchedule::GetFollowingEvent() in case there is currently no present event
+  running (thanks to Pekka Mauno).
diff --git a/epg.c b/epg.c
index a8328a8b..2f88af9a 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.63 2006/02/26 13:54:44 kls Exp $
+ * $Id: epg.c 1.64 2006/02/26 15:07:17 kls Exp $
  */
 
 #include "epg.h"
@@ -691,6 +691,13 @@ const cEvent *cSchedule::GetFollowingEvent(void) const
   const cEvent *p = GetPresentEvent();
   if (p)
      p = events.Next(p);
+  else { 
+     time_t now = time(NULL);
+     for (p = events.First(); p; p = events.Next(p)) {
+         if (p->StartTime() >= now)
+            break;
+         }
+     }
   return p;
 }