diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b1714dd4..de023cd0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -315,6 +315,8 @@ Rainer Zocholl <vdrcontrib@zocki.toppoint.de>
  for suggesting a confirmation prompt when the user presses the "Power" button
  and there is an upcoming timer event
  for reporting a bug in skipping the next hit of a repeating timer
+ for reporting a problem with staying off the end of an ongoing recording while
+ replaying in time shift mode
 
 Oleg Assovski <assen@bitcom.msk.ru>
  for adding EPG scanning for another 4 days
diff --git a/HISTORY b/HISTORY
index 68bc5af9..d5143176 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2298,3 +2298,5 @@ Video Disk Recorder Revision History
 - Made crc32() a static function in libdtv/libsi/si_parser.c to avoid a name clash
   when using other libraries that also implement a function by that name (thanks
   to Reinhard Nissl for reporting this one).
+- Fixed staying off the end of an ongoing recording while replaying in time shift
+  mode (thanks to Rainer Zocholl for reporting this one).
diff --git a/recording.c b/recording.c
index 06f63255..2e3676a3 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.80 2003/05/30 13:23:54 kls Exp $
+ * $Id: recording.c 1.81 2003/08/15 15:23:10 kls Exp $
  */
 
 #include "recording.h"
@@ -770,7 +770,7 @@ void cRecordingUserCommand::InvokeCommand(const char *State, const char *Recordi
 #define INDEXFILESUFFIX     "/index.vdr"
 
 // The number of frames to stay off the end in case of time shift:
-#define INDEXSAFETYLIMIT 100 // frames
+#define INDEXSAFETYLIMIT 150 // frames
 
 // The maximum time to wait before giving up while catching up on an index file:
 #define MAXINDEXCATCHUP   8 // seconds