diff --git a/.travis.yml b/.travis.yml
index c2e204de4..e9788d788 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,7 @@ matrix:
       sudo: required
       compiler: clang
     - os: osx
-      osx_image: xcode9
-    - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.2
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f27b1ac3..619af2ba7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,15 @@
+cmake_minimum_required(VERSION 3.5)
 project(pvr.iptvsimple)
 
-cmake_minimum_required(VERSION 2.6)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 
-enable_language(CXX)
-
 find_package(Kodi REQUIRED)
 find_package(p8-platform REQUIRED)
 find_package(Rapidxml REQUIRED)
 find_package(ZLIB REQUIRED)
 
 include_directories(${p8-platform_INCLUDE_DIRS}
-                    ${KODI_INCLUDE_DIR}
+                    ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
                     ${RAPIDXML_INCLUDE_DIRS}
                     ${ZLIB_INCLUDE_DIRS})
 
diff --git a/README.md b/README.md
index ab9d577dc..688d16435 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/kodi-pvr/pvr.iptvsimple.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.iptvsimple)
+[![Build Status](https://travis-ci.org/kodi-pvr/pvr.iptvsimple.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.iptvsimple/branches)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/kodi-pvr/pvr.iptvsimple?branch=Matrix&svg=true)](https://ci.appveyor.com/project/kodi-pvr/pvr-iptvsimple?branch=Matrix)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # IPTV Simple PVR
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..b1d87f9af
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,33 @@
+version: BuildNr.{build}
+
+image: Visual Studio 2017
+
+shallow_clone: true
+
+clone_folder: c:\projects\pvr.iptvsimple
+
+environment:
+  app_id: pvr.iptvsimple
+
+  matrix:
+    - GENERATOR: "Visual Studio 15"
+      CONFIG: Release
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+    - GENERATOR: "Visual Studio 15 ARM"
+      CONFIG: Release
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+
+build_script:
+  - cd ..
+  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
+  - cd %app_id%
+  - mkdir build
+  - cd build
+  - mkdir -p definition\%app_id%
+  - echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
+  - cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
+  - cmake --build . --config %CONFIG% --target %app_id%
\ No newline at end of file
diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
index baf23a4c2..dc8126507 100644
--- a/pvr.iptvsimple/addon.xml.in
+++ b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="4.2.1"
+  version="4.2.2"
   name="PVR IPTV Simple Client"
   provider-name="nightik">
   <requires>@ADDON_DEPENDS@</requires>
diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
index b03eefbb7..be39b4812 100644
--- a/pvr.iptvsimple/changelog.txt
+++ b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,8 @@
+v4.2.2
+- Update build system version
+- Change header include way
+- Add AppVeyor for Windows related build tests
+
 v4.2.1
 - Fix nullptr initialisation
 
diff --git a/src/PVRIptvData.h b/src/PVRIptvData.h
index 0c885b127..c2c3ee6ae 100644
--- a/src/PVRIptvData.h
+++ b/src/PVRIptvData.h
@@ -24,7 +24,7 @@
  */
 
 #include "p8-platform/os.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 #include "p8-platform/threads/threads.h"
 
 #include <map>
diff --git a/src/client.cpp b/src/client.cpp
index fcfe01d6d..539f253c9 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -26,7 +26,7 @@
 
 #include "PVRIptvData.h"
 #include "p8-platform/util/util.h"
-#include "xbmc_pvr_dll.h"
+#include "kodi/xbmc_pvr_dll.h"
 
 using namespace ADDON;
 
diff --git a/src/client.h b/src/client.h
index a5450a8be..ea2fdf770 100644
--- a/src/client.h
+++ b/src/client.h
@@ -23,8 +23,8 @@
  *
  */
 
-#include "libXBMC_addon.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_addon.h"
+#include "kodi/libXBMC_pvr.h"
 
 #define M3U_FILE_NAME "iptv.m3u.cache"
 #define TVG_FILE_NAME "xmltv.xml.cache"