diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 21b20dc4..48b54d4c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1114,6 +1114,8 @@ Marco Schl
  for implementing displaying mandatory subtitles in the SPU decoder
  for pointing out a problem with canceling the LIRC thread
  for a patch that implements substream handling into cDevice::PlayPesPacket()
+ for pointing out that PlayPes(NULL, 0) needs to be called in cTransfer::Action()
+ when clearing the transfer buffer to avoid overflows
 
 Jürgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index dbcb20dc..9ed470d5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3330,3 +3330,5 @@ Video Disk Recorder Revision History
   to Marco Schlüßler for a patch that implements substream handling into
   cDevice::PlayPesPacket(), and Reinhard Nissl for adding substream handling to
   cDolbyRepacker).
+- Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
+  to avoid overflows (thanks to Marco Schlüßler for pointing this out).
diff --git a/transfer.c b/transfer.c
index b151971e..b3cbec45 100644
--- a/transfer.c
+++ b/transfer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: transfer.c 1.24 2005/01/16 15:12:58 kls Exp $
+ * $Id: transfer.c 1.25 2005/01/23 14:27:40 kls Exp $
  */
 
 #include "transfer.h"
@@ -100,6 +100,7 @@ void cTransfer::Action(void)
               dsyslog("clearing transfer buffer to avoid overflows");
               ringBuffer->Clear();
               remux->Clear();
+              PlayPes(NULL, 0);
               p = NULL;
               continue;
               }