diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 419dc216..28780a7c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2893,6 +2893,8 @@ Torsten Lang <info@torstenlang.de>
  thread is running
  for suggesting to allow I/O intense threads to temporarily suspend their activities
  in case buffers run full
+ for suggesting to increase the size of the TS buffer to 5MB and that of the Recorder
+ buffer to 20MB to better handle HD recordings
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
diff --git a/HISTORY b/HISTORY
index acfdda73..474d0724 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7256,3 +7256,5 @@ Video Disk Recorder Revision History
   Currently the cutter thread is suspended if the TS or Recorder buffer use more
   than 50% of their capacity. Plugin authors may want to participate in this
   mechanism if they use intense background I/O.
+- Increased the size of the TS buffer to 5MB and that of the Recorder buffer to
+  20MB to better handle HD recordings (suggested by Torsten Lang).
diff --git a/dvbdevice.c b/dvbdevice.c
index 55cb9127..a7635b23 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 2.71 2012/05/09 08:33:59 kls Exp $
+ * $Id: dvbdevice.c 2.72 2012/09/22 11:53:57 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -1540,7 +1540,7 @@ bool cDvbDevice::OpenDvr(void)
   CloseDvr();
   fd_dvr = DvbOpen(DEV_DVB_DVR, adapter, frontend, O_RDONLY | O_NONBLOCK, true);
   if (fd_dvr >= 0)
-     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1);
+     tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(5), CardIndex() + 1);
   return fd_dvr >= 0;
 }
 
diff --git a/recorder.c b/recorder.c
index c11fdf7c..a9cc8c95 100644
--- a/recorder.c
+++ b/recorder.c
@@ -4,13 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recorder.c 2.16 2012/09/22 11:52:33 kls Exp $
+ * $Id: recorder.c 2.17 2012/09/22 11:53:57 kls Exp $
  */
 
 #include "recorder.h"
 #include "shutdown.h"
 
-#define RECORDERBUFSIZE  (MEGABYTE(5) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE
+#define RECORDERBUFSIZE  (MEGABYTE(20) / TS_SIZE * TS_SIZE) // multiple of TS_SIZE
 
 // The maximum time we wait before assuming that a recorded video data stream
 // is broken: