diff --git a/HISTORY b/HISTORY
index 82bde849..c7173b6a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3613,7 +3613,7 @@ Video Disk Recorder Revision History
 - Modified cEITScanner::Process() so that it works on systems with only budget cards
   or a mix of DVB-S, DVB-C or DVB-T cards.
 
-2005-06-18: Version 1.3.27
+2005-06-19: Version 1.3.27
 
 - Fixed handling 'page down', which was broken in version 1.3.26 (thanks to Udo
   Richter).
@@ -3624,3 +3624,9 @@ Video Disk Recorder Revision History
   now runs fine with NPTL.
 - Fixed handling VPS timers, so that they only record if the event they are assigned
   to actually has the given VPS time.
+- Disabled cVideoRepacker in remux.c, because it has caused several problems
+  during recording. If you want to test (and maybe debug) it, activate the line
+
+  //#define TEST_cVideoRepacker
+
+  in remux.c.
diff --git a/remux.c b/remux.c
index 83d13565..c4e7b203 100644
--- a/remux.c
+++ b/remux.c
@@ -11,7 +11,7 @@
  * The cDolbyRepacker code was originally written by Reinhard Nissl <rnissl@gmx.de>,
  * and adapted to the VDR coding style by Klaus.Schmidinger@cadsoft.de.
  *
- * $Id: remux.c 1.34 2005/06/04 14:49:25 kls Exp $
+ * $Id: remux.c 1.35 2005/06/19 10:17:00 kls Exp $
  */
 
 #include "remux.h"
@@ -1155,7 +1155,12 @@ cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, b
   resultBuffer = new cRingBufferLinear(RESULTBUFFERSIZE, IPACKS, false, "Result");
   resultBuffer->SetTimeouts(0, 100);
   if (VPid)
+//#define TEST_cVideoRepacker
+#ifdef TEST_cVideoRepacker
      ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS, 0x00, 0x00, new cVideoRepacker);
+#else
+     ts2pes[numTracks++] = new cTS2PES(VPid, resultBuffer, IPACKS);
+#endif
   if (APids) {
      int n = 0;
      while (*APids && numTracks < MAXTRACKS && n < MAXAPIDS)