diff --git a/HISTORY b/HISTORY
index 96c1884..78e37cd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -240,3 +240,7 @@ VDR Plugin 'femon' Revision History
 - Added INFO SVDRP command (partially based on patch by Herbert Pötzl).
 - Removed system log option - use SVDRP instead.
 - Added --remove-destination to the 'cp' command in Makefile.
+
+2007-01-08: Version 1.1.1
+
+- Updated for vdr-1.5.0.
diff --git a/femon.h b/femon.h
index 840beff..b365036 100644
--- a/femon.h
+++ b/femon.h
@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char VERSION[]       = "1.1.0";
+static const char VERSION[]       = "1.1.1";
 static const char DESCRIPTION[]   = "DVB Signal Information Monitor (OSD)";
 static const char MAINMENUENTRY[] = "Signal Information";
 
diff --git a/femonclient/vdr-femonclient-0.0.1.tgz b/femonclient/vdr-femonclient-0.0.1.tgz
deleted file mode 100644
index 940640d..0000000
Binary files a/femonclient/vdr-femonclient-0.0.1.tgz and /dev/null differ
diff --git a/femonclient/vdr-femonclient-0.0.2.tgz b/femonclient/vdr-femonclient-0.0.2.tgz
new file mode 100644
index 0000000..f24348e
Binary files /dev/null and b/femonclient/vdr-femonclient-0.0.2.tgz differ
diff --git a/femonosd.c b/femonosd.c
index 36f063d..99155a9 100644
--- a/femonosd.c
+++ b/femonosd.c
@@ -602,7 +602,7 @@ void cFemonOsd::Show(void)
         cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
         IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
         IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-        m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid);
+        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
         cDevice::ActualDevice()->AttachReceiver(m_Receiver);
         }
      Start();
@@ -645,7 +645,7 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
      IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
      IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid);
+     m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
      cDevice::ActualDevice()->AttachReceiver(m_Receiver);
      }
 }
@@ -662,7 +662,7 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
      IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
      IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-     m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), apid, dpid);
+     m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
      cDevice::ActualDevice()->AttachReceiver(m_Receiver);
      }
 }
@@ -690,7 +690,11 @@ bool cFemonOsd::DeviceSwitch(int direction)
            cDevice::GetDevice(device)->SwitchChannel(channel, true);
            if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
               cDevice::GetDevice(device)->ForceTransferMode();
+#if defined(APIVERSNUM) && APIVERSNUM < 10500
            cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
+#else
+           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
+#endif
            cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
            return (true);
            }
diff --git a/femonreceiver.c b/femonreceiver.c
index 860fed3..ee67b52 100644
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -17,8 +17,12 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0
 
-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
+cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
+#if defined(APIVERSNUM) && APIVERSNUM < 10500
 :cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
+#else
+:cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
+#endif
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
   m_VideoPid = Vpid;
diff --git a/femonreceiver.h b/femonreceiver.h
index 068ff54..0eb4620 100644
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -96,7 +96,7 @@ protected:
   virtual void Action(void);
 
 public:
-  cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]);
+  cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
   virtual ~cFemonReceiver();
 
   bool VideoValid(void)           { return m_VideoValid; };          // boolean