diff --git a/HISTORY b/HISTORY
index 0f54598..0c965c9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- increased client side timeout for TUNE command
 - fixed regression: no receiver created for ES/PS/PES (reported by Gavin
   Hamill)
 - VTP no longer uses a static priority value for its server-side receivers.
diff --git a/client/socket.c b/client/socket.c
index f2b5eea..ca30925 100644
--- a/client/socket.c
+++ b/client/socket.c
@@ -250,7 +250,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());