diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ae9918f..a44768d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -225,3 +225,6 @@ hivdr
 hummel99
   for reporting and helping to debug channel switch issues with priority > 0
   for reporting a race condition when switching the server's LiveTV device
+
+Oliver Wagner
+  for making cStatus::ChannelChange re-tune only if CA IDs changed
diff --git a/HISTORY b/HISTORY
index f3f444b..58ea57b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
  
+- Make ChannelChange retune only if CA IDs changed (thanks to Oliver Wagner)
 - Implemented VDR 2.1.4 cStatus::ChannelChange(...)
 - Call detach only if receiver is attached
 - Try changing to other device when receiver got detached
diff --git a/server/livestreamer.c b/server/livestreamer.c
index 1ddae0c..8dce11d 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -356,6 +356,7 @@ cStreamdevLiveStreamer::cStreamdevLiveStreamer(const cServerConnection *Connecti
 			m_Device = SwitchDevice(Channel, Priority);
 			if (m_Device)
 				SetChannel(Apid, Dpid);
+			memcpy(m_Caids,Channel->Caids(),sizeof(m_Caids));
 		}
 }
 
@@ -672,14 +673,22 @@ bool cStreamdevLiveStreamer::ProvidesChannel(const cChannel *Channel, int Priori
 
 void cStreamdevLiveStreamer::ChannelChange(const cChannel *Channel)
 {
-	if (Running() && m_Device && m_Device->ProvidesTransponder(Channel) && ISTRANSPONDER(m_Channel->Transponder(), Channel->Transponder())) {
-		Detach();
-		if (m_Device->SwitchChannel(m_Channel, false)) {
-			Attach();
-			dsyslog("streamdev: channel %d (%s) changed", Channel->Number(), Channel->Name());
+	if (Running() && m_Device && m_Channel == Channel) {
+		// Check whether the Caids actually changed
+		// If not, no need to re-tune, probably just an Audio PID update
+		if (!memcmp(m_Caids, Channel->Caids(), sizeof(m_Caids))) {
+			dsyslog("streamdev: channel %d (%s) changed, but caids remained the same, not re-tuning", Channel->Number(), Channel->Name());
+		}
+		else {
+			Detach();
+			if (m_Device->SwitchChannel(m_Channel, false)) {
+				Attach();
+				dsyslog("streamdev: channel %d (%s) changed, re-tuned", Channel->Number(), Channel->Name());
+				memcpy(m_Caids, Channel->Caids(), sizeof(m_Caids));
+			}
+			else
+				isyslog("streamdev: failed to re-tune after channel %d (%s) changed", Channel->Number(), Channel->Name());
 		}
-		else
-			isyslog("streamdev: failed to re-tune after channel %d (%s) changed", Channel->Number(), Channel->Name());
 	}
 }
 
diff --git a/server/livestreamer.h b/server/livestreamer.h
index 36e98d1..055de4d 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -28,6 +28,7 @@ private:
 	int                     m_Priority;
 	int                     m_Pids[MAXRECEIVEPIDS + 1];
 	int                     m_NumPids;
+	int                     m_Caids[MAXCAIDS + 1];
 	eStreamType             m_StreamType;
 	const cChannel         *m_Channel;
 	cDevice                *m_Device;