diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index dab2a7c692..ad66a846d4 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -128,7 +128,7 @@ generator library for C++.")
 ;; of the standard build process. To make things easier, we bootstrap
 ;; and patch shebangs here, so we don't have to worry about it later.
 (define libdvdnav/kodi
-  (let ((commit "981488f7f27554b103cca10c1fbeba027396c94a"))
+  (let ((commit "6.0.0-Leia-Alpha-1"))
     (package
       (name "libdvdnav-bootstrapped")
       (version commit)
@@ -140,7 +140,7 @@ generator library for C++.")
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
                  (base32
-                  "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8"))))
+                  "1xiyfgf8v8aknlxlzsvk6pbzkhclz0hbh3s1b0w6ivkng2k310j9"))))
       (build-system gnu-build-system)
       (arguments
        '(#:tests? #f
@@ -165,7 +165,7 @@ generator library for C++.")
       (license license:gpl2+))))
 
 (define libdvdread/kodi
-  (let ((commit "17d99db97e7b8f23077b342369d3c22a6250affd"))
+  (let ((commit "6.0.0-Leia-Alpha-1"))
     (package
       (name "libdvdread-bootstrapped")
       (version commit)
@@ -177,7 +177,7 @@ generator library for C++.")
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
                  (base32
-                  "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl"))))
+                  "1c3g18n2vwhgcfz3dka1pmw58bnv2ram7xjvizfiykb3sgi9zfwp"))))
       (build-system gnu-build-system)
       (arguments
        '(#:tests? #f
@@ -202,7 +202,7 @@ generator library for C++.")
       (license (list license:gpl2+ license:lgpl2.1+)))))
 
 (define libdvdcss/kodi
-  (let ((commit "2f12236bc1c92f73c21e973363f79eb300de603f"))
+  (let ((commit "1.4.1-Leia-Alpha-1"))
     (package
       (name "libdvdcss-bootstrapped")
       (version commit)
@@ -214,7 +214,7 @@ generator library for C++.")
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
                  (base32
-                  "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd"))))
+                  "0adafwsawxssj3nilkql447v0l4a2584rdpmy5rfjmznh91lykgh"))))
       (build-system gnu-build-system)
       (arguments
        '(#:tests? #f
@@ -241,20 +241,20 @@ generator library for C++.")
 (define-public kodi
   ;; We package the git version because the current released
   ;; version was cut while the cmake transition was in turmoil.
-  (let ((commit "67fd70f01a363002881f3519b50765b756716e3b")
-        (revision "7"))
+  (let ((commit "ec16dbca4dcf2923f53f819695a6d47c52e68d74")
+        (revision "8"))
   (package
     (name "kodi")
-    (version (string-append "18.0_alpha-" revision "-" (string-take commit 7)))
+    (version (git-version "18.0_alpha" revision commit))
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/xbmc/xbmc.git")
                     (commit commit)))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "12975n4r982kmxc0r9w24n3lrj7aj3cs4fjkdjnn0r9jbnvfxhs3"))
+                "1rxg752cl59124cfpfwmyjldn6qpq5jginxddpzvgagfadf10i4d"))
               (snippet
                '(begin
                   (use-modules (guix build utils))
@@ -267,7 +267,6 @@ generator library for C++.")
                               ;; "tools/depend/native/TexturePacker"
                               ;; "lib/gtest"
                               ;; "lib/cpluff"
-                              ;; "lib/libexif"
                               ;; "lib/libUPnP"
                               "lib/libUPnP/Neptune/ThirdParty"
                               "project/Win32BuildSetup/tools/7z"))
@@ -318,7 +317,7 @@ generator library for C++.")
                ;; to make them writable before the build process starts.
                (("autoreconf -vif") "chmod -R u+w ."))
 
-             (substitute* "xbmc/linux/LinuxTimezone.cpp"
+             (substitute* "xbmc/platform/linux/LinuxTimezone.cpp"
                (("/usr/share/zoneinfo")
                 (string-append (assoc-ref inputs "tzdata")
                                "/share/zoneinfo")))
@@ -420,7 +419,7 @@ generator library for C++.")
     (description "Kodi is a media center application for playing videos,
 music, games, etc.  Kodi is highly customizable and features a theme and
 plug-in system.")
-    (home-page "http://kodi.tv")
+    (home-page "https://kodi.tv")
     ;; XBMC is largely GPL2+, with some library components as LGPL2.1+, but
     ;; there are some other licenses spread throughout.
     (license (list license:gpl2+ license:lgpl2.1+