diff --git a/HISTORY b/HISTORY
index 4dbd43f3..c0b855d2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4968,3 +4968,4 @@ Video Disk Recorder Revision History
   Petri Hintukainen).
 - Fixed handling plugins from cRemote::PutMacro() and cRemote::CallPlugin()
   (based on a patch from Petri Hintukainen).
+- Increased the size of the key queue to avoid problems with long key macros.
diff --git a/remote.h b/remote.h
index e5b80b2c..4477666b 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.36 2006/10/14 10:56:50 kls Exp $
+ * $Id: remote.h 1.37 2006/10/14 11:46:58 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -19,7 +19,7 @@
 
 class cRemote : public cListObject {
 private:
-  enum { MaxKeys = MAXKEYSINMACRO };
+  enum { MaxKeys = 2 * MAXKEYSINMACRO };
   static eKeys keys[MaxKeys];
   static int in;
   static int out;