diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f3c8522d..0239a0cc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -902,6 +902,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making pressing the Power button not stop Transfer Mode or replay immediately
  for making EPG events without a title display "No title" instead of "(null)"
  for changing the title of the recording info menu
+ for reporting a bug in handling key macros with keys after @plugin
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index f76de83a..d0aeea35 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3817,3 +3817,5 @@ Video Disk Recorder Revision History
   no guarantee that this really works under all circumstances.
 - Added a missing include statement to the 'sky' plugin (thanks to Alfred Zastrow
   for reporting this one).
+- Fixed handling key macros with keys after @plugin (thanks to Rolf Ahrenberg for
+  reporting this one).
diff --git a/keys.c b/keys.c
index 8d1c607d..57b4f13e 100644
--- a/keys.c
+++ b/keys.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: keys.c 1.8 2005/09/03 11:28:34 kls Exp $
+ * $Id: keys.c 1.9 2005/09/17 11:27:40 kls Exp $
  */
 
 #include "keys.h"
@@ -208,7 +208,7 @@ bool cKeyMacro::Parse(char *s)
                  esyslog("ERROR: @plugin can't be first in macro");
                  return false;
                  }
-              macro[n++] = k_Plugin;
+              macro[n] = k_Plugin;
               if (n < MAXKEYSINMACRO) {
                  plugin = strdup(p + 1);
                  if (!cPluginManager::GetPlugin(plugin)) {