diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 795bc620..f42d00cd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -269,6 +269,8 @@ Werner Fink <werner@suse.de>
  for pointing out an error in masking SubStreamType in cDevice::PlayPesPacket()
  for pointing out that the "pre 1.3.19" compatibility mode for old Dolby Digital
  recordings can be triggered in the default branch
+ for pointing out that pesAssembler->Reset() needs to be called between subsequent
+ Transfer Modes
 
 Rolf Hakenes <hakenes@hippomi.de>
  for providing 'libdtv' and adapting the EIT mechanisms to it
diff --git a/HISTORY b/HISTORY
index ec4f75e2..c27a469d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3369,3 +3369,6 @@ Video Disk Recorder Revision History
 - Making sure the "Mute" and "Volume+/-" keys don't interfere with digital audio.
 - Fixed the "pre 1.3.19" compatibility mode for old Dolby Digital recordings (thanks
   to Werner Fink for pointing out that this can be triggered in the default branch).
+- Calling pesAssembler->Reset() in cDevice::AttachPlayer() to avoid problems with
+  residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this
+  out).
diff --git a/device.c b/device.c
index a690cb1c..ebd59504 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.85 2005/02/06 13:13:31 kls Exp $
+ * $Id: device.c 1.86 2005/02/06 13:42:54 kls Exp $
  */
 
 #include "device.h"
@@ -783,6 +783,7 @@ bool cDevice::AttachPlayer(cPlayer *Player)
      if (player)
         Detach(player);
      ClrAvailableTracks();
+     pesAssembler->Reset();
      player = Player;
      SetPlayMode(player->playMode);
      player->device = this;