diff --git a/HISTORY b/HISTORY
index 371a0c25..9142dce7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2598,3 +2598,4 @@ Video Disk Recorder Revision History
   scan on a single DVB card system (see MANUAL for details).
 - The new SVDRP command 'SCAN' can be used to force  an EPG scan on a single
   DVB card system (see MANUAL under Setup/EPG for details).
+- Fixed handling PID changes in 'Transfer Mode'.
diff --git a/vdr.c b/vdr.c
index e8987398..c4449858 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.173 2004/01/16 13:59:57 kls Exp $
+ * $Id: vdr.c 1.174 2004/01/17 16:56:57 kls Exp $
  */
 
 #include <getopt.h>
@@ -52,6 +52,7 @@
 #include "sources.h"
 #include "timers.h"
 #include "tools.h"
+#include "transfer.h"
 #include "videodir.h"
 
 #define MINCHANNELWAIT  10 // seconds to wait between failed channel switchings
@@ -520,7 +521,7 @@ int main(int argc, char *argv[])
                   if (Channel && Channel->Modification(CHANNELMOD_RETUNE)) {
                      cRecordControls::ChannelDataModified(Channel);
                      if (Channel->Number() == cDevice::CurrentChannel()) {
-                        if (!cDevice::PrimaryDevice()->Replaying()) {
+                        if (!cDevice::PrimaryDevice()->Replaying() || cTransferControl::ReceiverDevice()) {
                            isyslog("retuning due to modification of channel %d", Channel->Number());
                            Channels.SwitchTo(Channel->Number());
                            }