diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d6982e45..5b460ca9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1164,6 +1164,7 @@ Thomas Bergwinkl <Thomas.Bergwinkl@vr-web.de>
  two transponders on the same frequency, with different polarization
  for fixing detecting if there can be any useful further input when entering channel
  numbers
+ for fixing handling the '0' key for switching between the last two channels
 
 Stéphane Esté-Gracias <sestegra@free.fr>
  for fixing a typo in libsi/si.h
diff --git a/HISTORY b/HISTORY
index b3cae61c..18e56369 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4225,3 +4225,5 @@ Video Disk Recorder Revision History
 - Fixed detecting if there can be any useful further input when entering channel
   numbers (thanks to Thomas Bergwinkl).
 - Updated the Spanish OSD texts (thanks to Jesus Bravo Alvarez).
+- Fixed handling the '0' key for switching between the last two channels (thanks
+  to Thomas Bergwinkl).
diff --git a/vdr.c b/vdr.c
index 6e4d1857..35866dbd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.243 2006/01/22 13:32:41 kls Exp $
+ * $Id: vdr.c 1.244 2006/01/22 16:10:13 kls Exp $
  */
 
 #include <getopt.h>
@@ -727,7 +727,7 @@ int main(int argc, char *argv[])
            LastChannel = cDevice::CurrentChannel();
            LastChannelChanged = time(NULL);
            }
-        if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[0] && LastChannel != PreviousChannel[1])
+        if (time(NULL) - LastChannelChanged >= Setup.ZapTimeout && LastChannel != PreviousChannel[PreviousChannelIndex])
            PreviousChannel[PreviousChannelIndex ^= 1] = LastChannel;
         // Timers and Recordings:
         if (!Timers.BeingEdited()) {