diff --git a/HISTORY b/HISTORY
index 2e19fed4..0ba94002 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9028,3 +9028,5 @@ Video Disk Recorder Revision History
 - Extended the CI API to allow plugins to implement additional CAM resources.
 - Fixed a race between SVDRP CHAN and cDevice::HasProgramme() (reported by Dietmar
   Spingler).
+- Reduced the time before a CAM is marked as known to decrypt a particular channel to
+  3 seconds.
diff --git a/device.c b/device.c
index b957658e..7c1c74b1 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 4.21 2017/05/18 09:16:41 kls Exp $
+ * $Id: device.c 4.22 2017/05/18 09:27:55 kls Exp $
  */
 
 #include "device.h"
@@ -1654,7 +1654,7 @@ bool cDevice::Receiving(bool Dummy) const
 }
 
 #define TS_SCRAMBLING_TIMEOUT     3 // seconds to wait until a TS becomes unscrambled
-#define TS_SCRAMBLING_TIME_OK    10 // seconds before a Channel/CAM combination is marked as known to decrypt
+#define TS_SCRAMBLING_TIME_OK     3 // seconds before a Channel/CAM combination is marked as known to decrypt
 #define EIT_INJECTION_TIME       10 // seconds for which to inject EIT event
 
 void cDevice::Action(void)