diff --git a/pvr.stalker/addon.xml.in b/pvr.stalker/addon.xml.in
index 2897cb09..aae5d69f 100644
--- a/pvr.stalker/addon.xml.in
+++ b/pvr.stalker/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.stalker"
-  version="3.4.9"
+  version="4.0.0"
   name="Stalker Client"
   provider-name="Jamal Edey">
   <requires>@ADDON_DEPENDS@</requires>
diff --git a/pvr.stalker/changelog.txt b/pvr.stalker/changelog.txt
index 67f5aaaa..8789105c 100644
--- a/pvr.stalker/changelog.txt
+++ b/pvr.stalker/changelog.txt
@@ -1,3 +1,6 @@
+4.0.0
+- Update to PVR addon API v6.0.0
+
 3.4.6
 - Bump zlib to version 1.2.11
 
diff --git a/src/SData.cpp b/src/SData.cpp
index 02602bd3..97b99880 100644
--- a/src/SData.cpp
+++ b/src/SData.cpp
@@ -296,14 +296,14 @@ SError SData::Authenticate() {
     return SERROR_OK;
 }
 
-PVR_ERROR SData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end) {
+PVR_ERROR SData::GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end) {
     XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__);
 
     SC::Channel *chan;
     time_t now;
     SError ret;
 
-    chan = m_channelManager->GetChannel(channel.iUniqueId);
+    chan = m_channelManager->GetChannel(iChannelUid);
     if (chan == nullptr) {
         XBMC->Log(LOG_ERROR, "%s: channel not found", __FUNCTION__);
         return PVR_ERROR_SERVER_ERROR;
diff --git a/src/SData.h b/src/SData.h
index 55a62573..fee53663 100644
--- a/src/SData.h
+++ b/src/SData.h
@@ -48,7 +48,7 @@ class SData : Base::Cache {
 
     bool ReloadSettings();
 
-    PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t anEnd);
+    PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t anEnd);
 
     int GetChannelGroupsAmount();
 
diff --git a/src/client.cpp b/src/client.cpp
index a9ce0b27..63196bf6 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -223,11 +223,11 @@ const char *GetBackendHostname(void) {
     return "";
 }
 
-PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd) {
+PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd) {
     if (!m_data)
         return PVR_ERROR_SERVER_ERROR;
 
-    return m_data->GetEPGForChannel(handle, channel, iStart, iEnd);
+    return m_data->GetEPGForChannel(handle, iChannelUid, iStart, iEnd);
 }
 
 int GetChannelGroupsAmount(void) {
@@ -315,12 +315,12 @@ void DemuxReset(void) { }
 void DemuxAbort(void) { }
 void DemuxFlush(void) { }
 DemuxPacket *DemuxRead(void) { return NULL; }
+void FillBuffer(bool mode) {}
 bool CanPauseStream(void) { return false; }
 bool CanSeekStream(void) { return false; }
 void PauseStream(bool bPaused) { }
 bool SeekTime(double time, bool backwards, double *startpts) { return false; }
 void SetSpeed(int speed) { }
-bool IsTimeshifting(void) { return false; }
 bool IsRealTimeStream(void) { return true; }
 PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR SetRecordingLifetime(const PVR_RECORDING*) { return PVR_ERROR_NOT_IMPLEMENTED; }