diff --git a/HISTORY b/HISTORY
index 416e38d..eca03eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -85,3 +85,5 @@ VDR Plugin 'satip' Revision History
 - Refactored tuner implementation.
 - Updated against SAT>IP protocol specification
   version 1.2.1.
+- Added plenty of performance tweaks (Thanks to
+  Stefan Schallenberg).
diff --git a/device.c b/device.c
index d4fbe17..c02b303 100644
--- a/device.c
+++ b/device.c
@@ -29,7 +29,7 @@ cSatipDevice::cSatipDevice(unsigned int indexP)
   tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
                                    *cString::sprintf("SAT>IP TS %d", deviceIndexM));
   if (tsBufferM) {
-     tsBufferM->SetTimeouts(100, 100);
+     tsBufferM->SetTimeouts(10, 10);
      tsBufferM->SetIoThrottle();
      pTunerM = new cSatipTuner(*this, tsBufferM->Free());
      }