diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 58927f35..50147899 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -960,6 +960,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for some rearrangements in cDvbPlayer::Action() to avoid lockups on NPTL systems
  for implementing cVideoRepacker in remux.c to make sure every PES packet contains
  only data from one frame
+ for fixing the call to Channels.Unlock() in cEITScanner::Process()
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
diff --git a/HISTORY b/HISTORY
index 29205bfd..8489a417 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3593,3 +3593,5 @@ Video Disk Recorder Revision History
   for the bitstreamout plugin (thanks to Werner Fink).
 - Added the year (two digits) to recording dates in LSTR, and thus also in menus
   (suggested by Jan Ekholm).
+- Fixed the call to Channels.Unlock() in cEITScanner::Process() (thanks to
+  Reinhard Nissl).
diff --git a/eitscan.c b/eitscan.c
index e69ae055..9c98fff0 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.24 2005/05/05 13:05:00 kls Exp $
+ * $Id: eitscan.c 1.25 2005/06/05 14:43:29 kls Exp $
  */
 
 #include "eitscan.h"
@@ -181,9 +181,9 @@ void cEITScanner::Process(void)
                   break;
                   }
                }
+           Channels.Unlock();
            }
         lastScan = time(NULL);
-        Channels.Unlock();
         }
      }
 }