diff --git a/HISTORY b/HISTORY
index aee6f59..c57f74e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
  
+- increased client side timeout for TUNE command
 - more dsyslog messages to help troubleshouting channel switch issues
 - improved the channel switch code trying to move live TV to different card
 - make sure that a client doesn't interrupt replaying on server's FF card
diff --git a/client/socket.c b/client/socket.c
index 0e8974f..3e6dec8 100644
--- a/client/socket.c
+++ b/client/socket.c
@@ -249,7 +249,7 @@ bool cClientSocket::SetChannelDevice(const cChannel *Channel) {
 
 	std::string command = (std::string)"TUNE " 
 				+ (const char*)Channel->GetChannelID().ToString();
-	if (!Command(command, 220)) {
+	if (!Command(command, 220, 10000)) {
 		if (errno == 0)
 			esyslog("ERROR: Streamdev: Couldn't tune %s:%d to channel %s",
 			        RemoteIp().c_str(), RemotePort(), Channel->Name());