diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f65ffcc6..1d0aabcb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1488,6 +1488,7 @@ Marco Schl
  to avoid unnecessary OSD access
  for changing cDvbDevice::GrabImage() to use V4L2
  for adding a missing Detach() in cTransfer::Activate()
+ for adding clearing the TS buffers in cDevice::Detach()
 
 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 b1b88c08..3c6713e4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5928,3 +5928,4 @@ Video Disk Recorder Revision History
 - Fixed returning complete PES packets in cTsToPes::GetPes() (thanks to Reinhard
   Nissl).
 - Added a missing Detach() in cTransfer::Activate() (thanks to Marco Schlüßler).
+- Added clearing the TS buffers in cDevice::Detach() (thanks to Marco Schlüßler).
diff --git a/device.c b/device.c
index 8cd0b1e1..23db6160 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 2.5 2009/01/06 09:55:13 kls Exp $
+ * $Id: device.c 2.6 2009/01/16 15:20:21 kls Exp $
  */
 
 #include "device.h"
@@ -1098,6 +1098,7 @@ void cDevice::Detach(cPlayer *Player)
      dvbSubtitleConverter = NULL;
      SetPlayMode(pmNone);
      SetVideoDisplayFormat(eVideoDisplayFormat(Setup.VideoDisplayFormat));
+     PlayTs(NULL, 0);
      Audios.ClearAudio();
      }
 }