diff -Nru kodi-pvr-teleboy-19.8.7/debian/changelog kodi-pvr-teleboy-19.8.8/debian/changelog
--- kodi-pvr-teleboy-19.8.7/debian/changelog	2013-05-31 22:59:22.000000000 +0000
+++ kodi-pvr-teleboy-19.8.8/debian/changelog	2013-05-31 22:59:22.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-teleboy (6:19.8.7-1~focal) focal; urgency=low
+kodi-pvr-teleboy (6:19.8.8-1~focal) focal; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
diff -Nru kodi-pvr-teleboy-19.8.7/pvr.teleboy/addon.xml.in kodi-pvr-teleboy-19.8.8/pvr.teleboy/addon.xml.in
--- kodi-pvr-teleboy-19.8.7/pvr.teleboy/addon.xml.in	2013-05-31 22:59:22.000000000 +0000
+++ kodi-pvr-teleboy-19.8.8/pvr.teleboy/addon.xml.in	2013-05-31 22:59:22.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="pvr.teleboy"
-       version="19.8.7"
+       version="19.8.8"
        name="Teleboy PVR Client"
        provider-name="rbuehlma">
   <requires>
@@ -33,6 +33,8 @@
       <fanart>fanart.jpg</fanart>
     </assets>
     <news>
+v19.8.8
+ - Provide correct addond status to Kodi
 v19.8.7
  - Prevent login loop
 v19.8.6
diff -Nru kodi-pvr-teleboy-19.8.7/README.md kodi-pvr-teleboy-19.8.8/README.md
--- kodi-pvr-teleboy-19.8.7/README.md	2013-05-31 22:59:22.000000000 +0000
+++ kodi-pvr-teleboy-19.8.8/README.md	2013-05-31 22:59:22.000000000 +0000
@@ -8,7 +8,7 @@
 
 ## Build instructions
 
-1. `git clone --branch master https://github.com/xbmc/xbmc`
+1. `git clone --branch Matrix https://github.com/xbmc/xbmc`
 2. `git clone --branch Matrix https://github.com/rbuehlma/pvr.teleboy`
 3. `cd pvr.teleboy && mkdir build && cd build`
 4. `cmake -DADDONS_TO_BUILD=pvr.teleboy -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
diff -Nru kodi-pvr-teleboy-19.8.7/src/TeleBoy.cpp kodi-pvr-teleboy-19.8.8/src/TeleBoy.cpp
--- kodi-pvr-teleboy-19.8.7/src/TeleBoy.cpp	2013-05-31 22:59:22.000000000 +0000
+++ kodi-pvr-teleboy-19.8.8/src/TeleBoy.cpp	2013-05-31 22:59:22.000000000 +0000
@@ -100,6 +100,13 @@
   kodi::addon::CInstancePVRClient::ConnectionStateChange(connectionString, newState, message);
 }
 
+ADDON_STATUS TeleBoy::GetStatus() {
+  if (!m_session->IsConnected()) {
+    return ADDON_STATUS_LOST_CONNECTION;
+  }
+  return ADDON_STATUS_OK;
+}
+
 void TeleBoy::SessionInitialized()
 {
   while (updateThreads.size() < 3)
@@ -230,7 +237,7 @@
 PVR_ERROR TeleBoy::GetChannelsAmount(int& amount)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   if (m_session->GetFavoritesOnly())
@@ -247,7 +254,7 @@
 PVR_ERROR TeleBoy::GetChannels(bool radio, kodi::addon::PVRChannelsResultSet& results)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   int channelNum = 0;
@@ -320,7 +327,7 @@
 PVR_ERROR TeleBoy::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel, std::vector<kodi::addon::PVRStreamProperty>& properties)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   Document json;
@@ -457,7 +464,7 @@
 PVR_ERROR TeleBoy::DeleteRecording(const kodi::addon::PVRRecording& recording)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
   Document doc;
   if (!ApiDelete("/users/" + m_session->GetUserId() + "/recordings/" + recording.GetRecordingId(), doc))
@@ -471,7 +478,7 @@
 PVR_ERROR TeleBoy::GetRecordings(bool deleted, kodi::addon::PVRRecordingsResultSet& results)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   int totals = -1;
@@ -536,7 +543,7 @@
 PVR_ERROR TeleBoy::GetRecordingStreamProperties(const kodi::addon::PVRRecording& recording, std::vector<kodi::addon::PVRStreamProperty>& properties)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   PVR_ERROR ret = PVR_ERROR_FAILED;
@@ -578,7 +585,7 @@
 PVR_ERROR TeleBoy::GetTimers(kodi::addon::PVRTimersResultSet& results)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   int totals = -1;
@@ -635,7 +642,7 @@
 PVR_ERROR TeleBoy::AddTimer(const kodi::addon::PVRTimer& timer)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   if (timer.GetEPGUid() <= EPG_TAG_INVALID_UID)
@@ -660,7 +667,7 @@
 PVR_ERROR TeleBoy::DeleteTimer(const kodi::addon::PVRTimer& timer, bool forceDelete)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   Document doc;
@@ -686,7 +693,7 @@
 PVR_ERROR TeleBoy::IsEPGTagPlayable(const kodi::addon::PVREPGTag& tag, bool& isPlayable)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   if (!m_session->GetIsPaidMember())
@@ -713,7 +720,7 @@
 PVR_ERROR TeleBoy::GetEPGTagStreamProperties(const kodi::addon::PVREPGTag& tag, std::vector<kodi::addon::PVRStreamProperty>& properties)
 {
   if (!m_session->IsConnected()) {
-    return PVR_ERROR_FAILED;
+    return PVR_ERROR_SERVER_ERROR;
   }
 
   PVR_ERROR ret = PVR_ERROR_FAILED;
diff -Nru kodi-pvr-teleboy-19.8.7/src/TeleBoy.h kodi-pvr-teleboy-19.8.8/src/TeleBoy.h
--- kodi-pvr-teleboy-19.8.7/src/TeleBoy.h	2013-05-31 22:59:22.000000000 +0000
+++ kodi-pvr-teleboy-19.8.8/src/TeleBoy.h	2013-05-31 22:59:22.000000000 +0000
@@ -66,6 +66,7 @@
         std::vector<kodi::addon::PVRStreamProperty>& properties) override;
   PVR_ERROR GetEPGTagEdl(const kodi::addon::PVREPGTag& tag,
         std::vector<kodi::addon::PVREDLEntry>& edl) override;
+  ADDON_STATUS GetStatus() override;
   void UpdateConnectionState(const std::string& connectionString, PVR_CONNECTION_STATE newState, const std::string& message);
   virtual void SessionInitialized();