diff --git a/HISTORY b/HISTORY
index d2d6d712..03983c4e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7547,3 +7547,4 @@ Video Disk Recorder Revision History
   subtitle on the dvbhddevice in "high level" OSD mode.
 - Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given.
 - The index file is now closed after initially reading it if it is older than 3600 seconds.
+- Improved responsiveness during replay when close to the recording's end.
diff --git a/recording.c b/recording.c
index c2803255..fcc99424 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 2.84 2013/01/25 14:31:04 kls Exp $
+ * $Id: recording.c 2.85 2013/01/25 14:33:16 kls Exp $
  */
 
 #include "recording.h"
@@ -1865,7 +1865,8 @@ bool cIndexFile::CatchUp(int Index)
             LOG_ERROR_STR(*fileName);
          if (Index < last)
             break;
-         cCondWait::SleepMs(INDEXCATCHUPWAIT);
+         cCondVar CondVar;
+         CondVar.TimedWait(mutex, INDEXCATCHUPWAIT);
          }
      }
   return index != NULL;