diff --git a/src/zapit/include/zapit/client/msgtypes.h b/src/zapit/include/zapit/client/msgtypes.h
index 4321d8a53..38e0dbbcf 100644
--- a/src/zapit/include/zapit/client/msgtypes.h
+++ b/src/zapit/include/zapit/client/msgtypes.h
@@ -149,7 +149,9 @@ class CZapitMessages
 			CMD_SET_ASPECTRATIO		   = 108,
 			CMD_GET_MODE43			   = 109,
 			CMD_SET_MODE43			   = 110,
-			CMD_STOP_PIP			   = 111
+			CMD_STOP_PIP			   = 111,
+			CMD_ZAPTO_EPG			   = 112,
+			
 
 		};
 
@@ -193,6 +195,11 @@ class CZapitMessages
 		bool epg;
 		commandZaptoServiceID():channel_id(0),record(false),pip(false),epg(false){}
 	};
+	struct commandZaptoEpg
+	{
+		t_channel_id channel_id;
+		bool standby;
+	};
 
 	struct commandSetAudioChannel
 	{
diff --git a/src/zapit/include/zapit/client/zapitclient.h b/src/zapit/include/zapit/client/zapitclient.h
index 4f29331c8..3a166553c 100644
--- a/src/zapit/include/zapit/client/zapitclient.h
+++ b/src/zapit/include/zapit/client/zapitclient.h
@@ -276,7 +276,7 @@ class CZapitClient:public CBasicClient
 	unsigned int zapTo_serviceID(const t_channel_id channel_id);
 	unsigned int zapTo_record(const t_channel_id channel_id);
 	unsigned int zapTo_pip(const t_channel_id channel_id);
-	unsigned int zapTo_epg(const t_channel_id channel_id);
+	unsigned int zapTo_epg(const t_channel_id channel_id, bool standby = false);
 
 	/* zaps to subservice, returns the "zap-status" */
 	unsigned int zapTo_subServiceID(const t_channel_id channel_id);
diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp
index 2db89e08a..5804da1f8 100644
--- a/src/zapit/lib/zapitclient.cpp
+++ b/src/zapit/lib/zapitclient.cpp
@@ -202,16 +202,14 @@ unsigned int CZapitClient::zapTo_pip(const t_channel_id channel_id)
 	return response.zapStatus;
 }
 
-unsigned int CZapitClient::zapTo_epg(const t_channel_id channel_id)
+unsigned int CZapitClient::zapTo_epg(const t_channel_id channel_id, bool standby)
 {
-	CZapitMessages::commandZaptoServiceID msg;
+	CZapitMessages::commandZaptoEpg msg;
 
 	msg.channel_id = channel_id;
-	msg.record = false;
-	msg.pip = false;
-	msg.epg = true;
+	msg.standby = standby;
 
-	send(CZapitMessages::CMD_ZAPTO_SERVICEID, (const char *) & msg, sizeof(msg));
+	send(CZapitMessages::CMD_ZAPTO_EPG, (const char *) & msg, sizeof(msg));
 
 	CZapitMessages::responseZapComplete response;
 	CBasicClient::receive_data((char* )&response, sizeof(response));