diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index f4aacaf..3105bd4 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,3 +1,3 @@
 DIST bento4-1.6.0-639-7-Omega.tar.gz 5481533 BLAKE2B 0636f0c94ebb3246c8720e120f3b505e4a82ed2e37d9ed44351875dcf3fab8bc2e53b83e0be43fb711aac3144d6df3d8ae2ead24fcd55bd116f3c54f07e3c19f SHA512 bf257e5831eec44db944d1313858262c1ba32b6e67564bb8f809a1aa0fc8a55faaaac2357d80f1ce2e794914f6bec5263548e77802db2b9e52998af2b6276809
-DIST kodi-inputstream-adaptive-20.3.8.tar.gz 773011 BLAKE2B d9e7f0ca6fd0f4a7161b54d7d223b8a8a8cc5b66d65c88b31846e590f91ab8df3375bab526000c80a5d37e388a1d47220ea3aeaa031145a9165877cd15f3b093 SHA512 d7a358592bb597be40665b4f3bef86bfc4d10191fedb58bf54cfd828d5806db96d4bb0aca721023279b9071c52f011b37607189df697e7d59001bbafa5e68c69
-EBUILD kodi-inputstream-adaptive-20.3.8.ebuild 1002 BLAKE2B c6bc8b0509b95b269da72bf53a36ae36ee0356e3805fc126f50a338b00792991f7263886ca5d9fa4fa258e9ed3087be71ad2aca9783cb78fbe2f6fefe442c757 SHA512 a4d6e729ba60f88350efdee4fe91cfc975a4fe5b584f90f6a27c6781361206ef6d28256277664ed0fe42b6670a3aaeedf2d44a6c73e389d555cdc485524122ec
+DIST kodi-inputstream-adaptive-20.3.9.tar.gz 773076 BLAKE2B 454d016630f6670299de31c32a526f848b291e2b09e7015d55ef4af0cf71164f4926d3fe8d78216f73b5ae6c8581a0bb8aa4624a33230b711531c77e363980f1 SHA512 95045e4438ee02f0fb95908e36e9e4812b5674eea167cd72ad5e75e0009f21e837cb0cc803be13b90b67318f9ef8f3c1b6ede518a8484223861ced8480240127
+EBUILD kodi-inputstream-adaptive-20.3.9.ebuild 1002 BLAKE2B c6bc8b0509b95b269da72bf53a36ae36ee0356e3805fc126f50a338b00792991f7263886ca5d9fa4fa258e9ed3087be71ad2aca9783cb78fbe2f6fefe442c757 SHA512 a4d6e729ba60f88350efdee4fe91cfc975a4fe5b584f90f6a27c6781361206ef6d28256277664ed0fe42b6670a3aaeedf2d44a6c73e389d555cdc485524122ec
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.8.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.9.ebuild
similarity index 100%
rename from media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.8.ebuild
rename to media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-20.3.9.ebuild
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 9d3c363..fc0af4a 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,8 @@
+AUX kodi-20.1-VideoPlayerAudio-invalidate-previous-sync-type-after-Audio.patch 1010 BLAKE2B e623854a71f0b53b90950fbbf71ee4d666a24c3071c6ae8489d476a8407068e01028a69c8ec5cbff909a646dd15efe7a1807aeee214995ae1486281bce309e30 SHA512 3db461ebad0f922fab7727e902beada28b5b43e2b71d9c6e39bdf9b2a7767d214ea6caf3a975649a27ba77b7a9a93d5e7b1df6c1ec0edf61223855e2463d5115
+AUX kodi-20.1-ffmpeg5.patch 94498 BLAKE2B f8244260911df037ec6cdf945fe19dae7e71e98c052c0ce3ec4c9bf5459205bef7696af599b00a86d5b554d0cbc674fed6f7835a45dd6df40ae4e83549e55175 SHA512 9dc21d7e41eac956816330e79e826456566a88c5fdc747be234fe873ff3b9e7241d87dcc6ecd804189fff8b61c027ac4e31e1af0da5de0537f91e8f51b3d96c5
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
 DIST kodi-20.1-Nexus.tar.gz 54584529 BLAKE2B 32c945d7dbdcbfed4f319a91f445b6fd49de7fdcd59b2269aea46d7bc6b52677938800dbe9fba86e6e0451d86bb3afc80be6dd4f6f2fb83f6b2e3eb7375e2f8b SHA512 648df0649a0443d884b9414f43be4253764f1aaf9072aa8111e5a8a217c8291024ce1f27c2f7f673ac24005b32cc7dd25d86e99fc68166e3d5a637ae36b20f02
 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c SHA512 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
-EBUILD kodi-20.1.ebuild 10886 BLAKE2B 4cb9a50a7d7a57bf57a3f9f781f32b132af074feb340c752a4ea450080dbb7c217160803bdc6aa1ff3f0e9740b89c7bf9f38b180ef11a5d06cddfe3a51b30885 SHA512 db86aec1b2d21a614be87aabec4632ca7dbdaf6a8412613f75154e5cc4014d15eb768a3b6558b66a121f5b5047a43d2c3bbf30b6090f3d3f5697426bb88c3adb
+EBUILD kodi-20.1.ebuild 11018 BLAKE2B 3f7b7736877f912947de23c23ffe5475264e837271a8960202224217e529cde10c98d2f5326c422ed7b2c6255c831abd2d570af53a64c44ff09ffffd9a7f855c SHA512 102f2f58180d4f16550fd5442820f21a5e14e4cc64eea735e50258580330c3ba18ae9a6cdc56fe9e5ca7863abc7787ea7f54bbc8acd487f24e9ebc1f093e2984
diff --git a/media-tv/kodi/kodi-20.1.ebuild b/media-tv/kodi/kodi-20.1.ebuild
index c1137f5..a879d61 100644
--- a/media-tv/kodi/kodi-20.1.ebuild
+++ b/media-tv/kodi/kodi-20.1.ebuild
@@ -189,6 +189,11 @@ In some cases Kodi needs to access multicast addresses.
 Please consider enabling IP_MULTICAST under Networking options.
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-VideoPlayerAudio-invalidate-previous-sync-type-after-Audio.patch
+	"${FILESDIR}"/${P}-ffmpeg5.patch
+)
+
 pkg_setup() {
 	check_extra_config
 	python-single-r1_pkg_setup