diff --git a/alarm/kodi-c2/PKGBUILD b/alarm/kodi-c2/PKGBUILD
index faac8bf99..41ed041c1 100644
--- a/alarm/kodi-c2/PKGBUILD
+++ b/alarm/kodi-c2/PKGBUILD
@@ -22,9 +22,10 @@
 buildarch=8
 pkgbase=kodi-c2
 pkgname=('kodi-c2' 'kodi-c2-eventclients' 'kodi-c2-tools-texturepacker' 'kodi-c2-dev')
+_commit=7e7160eacdcb0c5b70e91dd4265d20358ba33c26
+_codename=Krypton
 pkgver=17.6
-_commit=094825c86d4995bef81419cd80dab0f2ed95eb79
-pkgrel=3
+pkgrel=4
 arch=('aarch64')
 url="http://kodi.tv"
 license=('GPL2')
@@ -36,24 +37,44 @@ makedepends=(
   'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow'
   'python2-pybluez' 'python2-simplejson' 'rtmpdump'
   'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
-  'mesa' 'libcrossguid'
-   'odroid-c2-libgl-fb' 'odroid-c2-libgl-headers' 'aml-libs-c2'
+  'mesa'
+  'odroid-c2-libgl-fb' 'odroid-c2-libgl-headers' 'aml-libs-c2'
 )
+_libdvdcss_commit="2f12236bc1c92f73c21e973363f79eb300de603f"
+_libdvdnav_commit="981488f7f27554b103cca10c1fbeba027396c94a"
+_libdvdread_commit="17d99db97e7b8f23077b342369d3c22a6250affd"
+_ffmpeg_version="3.1.11-$_codename-17.5"
+_crossguid_version="8f399e8bd4"
 source=(
-  "https://github.com/Owersun/xbmc/archive/${_commit}.tar.gz"
+  "$pkgbase-$pkgver-$_codename.tar.gz::https://github.com/Owersun/xbmc/archive/${_commit}.tar.gz"
+  "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_commit.tar.gz"
+  "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_commit.tar.gz"
+  "$pkgbase-libdvdread-$_libdvdread_commit.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_commit.tar.gz"
+  "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
   'fix-python-lib-path.patch'
   'kodi_permissions.conf'
   'kodi.service'
   'polkit.rules'
-  '99-odroid.rules'
+  '99-odroid.rules')
+sha256sums=('aafe2852620a6bc62c929bf1bdb24760e7e9573787ca4dd37aceed2d1dbb32dd'
+            'b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34'
+            '312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d'
+            'e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b'
+            '7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0'
+            '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
+            '1c07c9fdd8e2958262cf917e4266c4933fcd06529c111e3cb0cbaaa05c934033'
+            '8c606f29aa9ec90f4c93e1751cfd4000872937e604e6ad7538b96ba29612d2f6'
+            '3e4c21b376a187249a4b3195e4e88d49dbe819a55243d834a55cef86bac5ec2d'
+            'c68ed2bd377f80b606b8815d78239b9132b479eafc1d19797cee5824debe1800'
+            '5ddf80329c9f5d054525b45f788b3405d199bfc6cf5b08c543ad29766ec27f6e')
+noextract=(
+ "$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz"
+ "$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz"
+ "$pkgbase-libdvdread-$_libdvdread_commit.tar.gz"
+  "$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz"
+  "crossguid-$_crossguid_version.tar.gz"
 )
-sha512sums=('3c06bb72167796539df89288b92fe4b06f36b89823731739f522c65e3916946e64b038262329b0166f0945213822f19215e5b70618ab2f4bdda4511db52797ab'
-            '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2'
-            '890ed1fb944c337ed04397db7b2c8de5ef74f25eb49936e2fec418baf279cfa7d3ba292ccd6beccb60f83dc94b020d068162bc2c9a4ede8392d64ad7edcd5601'
-            '9953861cd17ec4c31094a2b1ef7161df13759b4b840cbc0231650ffc5349aa3ce98d8b860b1109eac22c6dcd153c43e165ed3451e5dbe2a3dbe130db53c28ad4'
-            '2e28e1366b89a94848822ccf8f6874fc69c1b2ffd27b129132e793bc41d27652f87d53deb48ff9a1dc01050f39a2bafa16b58e2a9c1c0f3cdc4155cd357c9b2a'
-            'dcb23c9074a6f646c419957169642bfd565e004f221bd972ae6034bcc4ef6aa6f4f2bbda011c759fef769b682f7a686cc041a02e5326530bd1ad2011366d1529')
-
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir kodi-build
@@ -68,14 +89,20 @@ build() {
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DENABLE_EVENTCLIENTS=ON \
     -DLIRC_DEVICE=/run/lirc/lircd \
-    -DENABLE_AML=ON                 \
-    -DENABLE_OPENGL=OFF             \
-    -DENABLE_OPENGLES=ON            \
-    -DENABLE_PULSEAUDIO=OFF         \
-    -DENABLE_VAAPI=OFF              \
-    -DENABLE_VDPAU=OFF              \
-    -DENABLE_X11=OFF                \
-    ../"xbmc-$_commit"/project/cmake
+    -DENABLE_AML=ON \
+    -DENABLE_OPENGL=OFF \
+    -DENABLE_OPENGLES=ON \
+    -DENABLE_PULSEAUDIO=OFF \
+    -DENABLE_VAAPI=OFF \
+    -DENABLE_VDPAU=OFF \
+    -DENABLE_X11=OFF \
+    -Dlibdvdcss_URL="$srcdir/$pkgbase-libdvdcss-$_libdvdcss_commit.tar.gz" \
+   -Dlibdvdnav_URL="$srcdir/$pkgbase-libdvdnav-$_libdvdnav_commit.tar.gz" \
+   -Dlibdvdread_URL="$srcdir/$pkgbase-libdvdread-$_libdvdread_commit.tar.gz" \
+   -DFFMPEG_URL="$srcdir/$pkgbase-ffmpeg-$_ffmpeg_version.tar.gz" \
+    -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+   ../"xbmc-$_commit"/project/cmake
   make
   make preinstall
 }
diff --git a/alarm/kodi-c2/kodi.service b/alarm/kodi-c2/kodi.service
index 2757d8137..9bc12ebce 100644
--- a/alarm/kodi-c2/kodi.service
+++ b/alarm/kodi-c2/kodi.service
@@ -1,5 +1,5 @@
 [Unit]
-Description = Starts an instance of Kodi
+Description = Kodi for C2
 After = remote-fs.target
 
 [Service]