diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a6663d9a..7bc76b99 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -539,3 +539,6 @@ Teemu Rantanen <tvr@iki.fi>
 
 Jan Ekholm <chakie@infa.abo.fi>
  for adding/improving some Swedish language OSD texts
+
+Marcel Wiesweg <marcel.wiesweg@gmx.de>
+ for pointing out a problem with high CPU load during replay
diff --git a/HISTORY b/HISTORY
index 93693668..e84d69f8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1956,3 +1956,8 @@ Video Disk Recorder Revision History
 - Turning SI filtering off and on when switching channels.
 - Timers are now processed even if an OSD menu is open (except for menus that
   explicitly handle timers).
+
+2003-02-15: Version 1.1.25
+
+- Fixed high CPU load during replay (thanks Marcel Wiesweg for pointing out this
+  one).
diff --git a/config.h b/config.h
index 1760eed9..d050516c 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.148 2003/02/08 10:25:44 kls Exp $
+ * $Id: config.h 1.149 2003/02/15 11:01:04 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.24"
+#define VDRVERSION "1.1.25"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/dvbplayer.c b/dvbplayer.c
index 1d140ea9..5aff3511 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.17 2003/01/19 15:43:58 kls Exp $
+ * $Id: dvbplayer.c 1.18 2003/02/15 10:38:59 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -420,8 +420,6 @@ void cDvbPlayer::Action(void)
   running = true;
   while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
         cPoller Poller;
-        if (!readFrame)
-           Poller.Add(replayFile, false);
         if (DevicePoll(Poller, 100)) {
 
            LOCK_THREAD;
@@ -532,7 +530,7 @@ void cDvbPlayer::Action(void)
                  backTrace->Add(playFrame->Index(), playFrame->Count());
                  ringBuffer->Drop(playFrame);
                  playFrame = NULL;
-                 p = 0;
+                 p = NULL;
                  }
               }
            }