diff --git a/HISTORY b/HISTORY
index d2afbd92..b31c7d4d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3876,3 +3876,5 @@ Video Disk Recorder Revision History
 - Now skipping some funny characters sent by some CAMs at the beginning of strings.
 - The CAM menu is now completely closed when pressing the Menu key while inside
   a sub menu.
+- Reduced MAX_CONNECT_RETRIES in ci.c to 2 (waiting too long made the whole thing
+  appear hanging).
diff --git a/ci.c b/ci.c
index 5218bdeb..f17a04b5 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.31 2005/10/02 13:20:41 kls Exp $
+ * $Id: ci.c 1.32 2005/10/02 14:10:51 kls Exp $
  */
 
 #include "ci.h"
@@ -400,7 +400,7 @@ const uint8_t *cCiTransportConnection::Data(int &Length)
   return tpdu->Data(Length);
 }
 
-#define MAX_CONNECT_RETRIES  20
+#define MAX_CONNECT_RETRIES  2
 
 int cCiTransportConnection::CreateConnection(void)
 {