diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f83683fa..ab37d90f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1319,6 +1319,7 @@ Reinhard Nissl <rnissl@gmx.de>
  receive channels
  for reporting that the Transfer Mode indicator bitmap in the LCARS skin may not
  fit with small font sizes
+ for reporting a race condition when zapping in transfer mode
 
 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 94eea630..3a7802d0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7191,7 +7191,7 @@ Video Disk Recorder Revision History
   turn on adding the source character to channel names whenever they are displayed
   (suggested by Ludi Kaleni).
 
-2012-08-25: Version 1.7.30
+2012-08-26: Version 1.7.30
 
 - Fixed sorting recordings in the top level video directory.
 - Fixed handling control characters in SI data in case of UTF-8 encoded strings
@@ -7205,3 +7205,4 @@ Video Disk Recorder Revision History
 - Added IsUpdate() to the EPG handler interface (thanks to Jörg Wendel).
 - Fixed detecting transfer mode on full featured DVB cards (thanks to Stefan Huelswitt
   for reporting a problem with updating CA descriptors in such cases).
+- Fixed a race condition when zapping in transfer mode (reported by Reinhard Nissl).