diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index c67d0fdaa..1bbf1d0a2 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -6054,7 +6054,7 @@ void CNeutrinoApp::getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::s
 }
 
 #ifdef ENABLE_PIP
-bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
+bool CNeutrinoApp::StartPip(const t_channel_id channel_id, int pip)
 {
 	bool ret = false;
 	if (!g_info.hw_caps->can_pip)
@@ -6069,7 +6069,7 @@ bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
 
 	int recmode = CRecordManager::getInstance()->GetRecordMode(channel_id);
 	if ((recmode == CRecordManager::RECMODE_OFF) || (channel->getRecordDemux() != channel->getPipDemux())) {
-		if (!g_Zapit->zapTo_pip(channel_id))
+		if (!g_Zapit->zapTo_pip(channel_id, pip))
 			DisplayErrorMessage(g_Locale->getText(LOCALE_VIDEOMENU_PIP_ERROR));
 		else
 			ret = true;
diff --git a/src/neutrino.h b/src/neutrino.h
index 07911b548..56b28a7b7 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -214,7 +214,7 @@ public:
 	void numericZap(int msg);
 	void StopSubtitles(bool enable_glcd_mirroring = true);
 	void StartSubtitles(bool show = true);
-	bool StartPip(const t_channel_id channel_id);
+	bool StartPip(const t_channel_id channel_id, int pip = 0);
 	void SelectSubtitles();
 	void showInfo(void);
 	void showMainMenu(void);
diff --git a/src/zapit/include/zapit/client/zapitclient.h b/src/zapit/include/zapit/client/zapitclient.h
index 7ada84e54..4692a722d 100644
--- a/src/zapit/include/zapit/client/zapitclient.h
+++ b/src/zapit/include/zapit/client/zapitclient.h
@@ -284,7 +284,7 @@ class CZapitClient:public CBasicClient
 	/* zaps to channel, returns the "zap-status" */
 	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_pip(const t_channel_id channel_id, int pip = 0);
 	unsigned int zapTo_epg(const t_channel_id channel_id, bool standby = false);
 
 	/* zaps to subservice, returns the "zap-status" */
@@ -504,7 +504,7 @@ class CZapitClient:public CBasicClient
 	void setStandby(const bool enable);
 	void startPlayBack(const bool sendpmt = false);
 	void stopPlayBack(const bool sendpmt = false);
-	void stopPip();
+	void stopPip(int pip = 0);
 	void lockPlayBack(const bool sendpmt = true);
 	void unlockPlayBack(const bool sendpmt = true);
 	bool tune_TP(TP_params TP);
diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index dc416fdc4..6a5eb2d49 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -283,8 +283,8 @@ class CZapit : public OpenThreads::Thread
 		int GetVolume() { return current_volume; };
 		int SetVolumePercent(int percent);
 		void SetVolumePercent(int default_ac3, int default_pcm);
-		bool StartPip(const t_channel_id channel_id);
-		bool StopPip();
+		bool StartPip(const t_channel_id channel_id, int pip = 0);
+		bool StopPip(int pip = 0);
 		void Lock() { mutex.lock(); }
 		void Unlock() { mutex.unlock(); }
 		void EnablePlayback(bool enable) { playbackStopForced = !enable; }
diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp
index 340a741e5..210234c32 100644
--- a/src/zapit/lib/zapitclient.cpp
+++ b/src/zapit/lib/zapitclient.cpp
@@ -206,7 +206,7 @@ unsigned int CZapitClient::zapTo_record(const t_channel_id channel_id)
 	return response.zapStatus;
 }
 
-unsigned int CZapitClient::zapTo_pip(const t_channel_id channel_id)
+unsigned int CZapitClient::zapTo_pip(const t_channel_id channel_id, int pip)
 {
 	CZapitMessages::commandZaptoServiceID msg;
 
@@ -1135,7 +1135,7 @@ void CZapitClient::stopPlayBack(const bool sendpmt)
 	close_connection();
 }
 
-void CZapitClient::stopPip()
+void CZapitClient::stopPip(int pip)
 {
 	OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
 	send(CZapitMessages::CMD_STOP_PIP);
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 40a2e7c48..f4dbaa5b3 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -680,7 +680,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
 }
 
 #ifdef ENABLE_PIP
-bool CZapit::StopPip()
+bool CZapit::StopPip(int pip)
 {
 	if (!g_info.hw_caps->can_pip)
 		return false;
@@ -706,7 +706,7 @@ bool CZapit::StopPip()
 	return false;
 }
 
-bool CZapit::StartPip(const t_channel_id channel_id)
+bool CZapit::StartPip(const t_channel_id channel_id, int pip)
 {
 	if (!g_info.hw_caps->can_pip)
 		return false;