diff --git a/build.gradle b/build.gradle
index a0041396c42d70efd4a6cc6d432f7bf5a00a2295..03858accb9ba2e0c83c8d066c21e9320c4b9bf26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,8 +42,8 @@ ext {
     versionCode = 3050400
     versionName = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? '4.0.0-preview - ' + versionCode : '3.5.4'
     vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3
-    libvlcVersion = vlcMajorVersion == 3 ? '3.6.0-eap5' :'4.0.0-eap8'
-    medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc5' : '0.13.13-vlc4-r5'
+    libvlcVersion = vlcMajorVersion == 3 ? '3.6.0-eap6' :'4.0.0-eap9'
+    medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc6' : '0.13.13-vlc4-r6'
     minSdkVersion = 17
     targetSdkVersion = 33
     compileSdkVersion = 33
diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 53ff78bd3c2ae6aa27025c20164a3c4f4a4f16a8..258faca22b7093aef7465ec84f28b068fc0b721d 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -6,7 +6,7 @@ set -e
 # ARGUMENTS #
 #############
 
-MEDIALIBRARY_HASH=c792471d8cd3d4bfb64279b3d6bd490e2171b93d
+MEDIALIBRARY_HASH=918b0e7ff962aa31fe8502ae9bd7d2fd389c6ff6
 
 while [ $# -gt 0 ]; do
   case $1 in
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 2e1a232ef5b596a7df9a5475f81c5297df7c1a64..1106b031840c1f0306e9875b7a4305ac13f9e636 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -259,7 +259,7 @@ fi
 
 
 if [ "$FORCE_VLC_4" = 1 ]; then
-    LIBVLCJNI_TESTED_HASH=720bd2afb4a1eb83aa363656f2a7a375efc1e75c
+    LIBVLCJNI_TESTED_HASH=94fab2637b0c78eaf11490247afcf8df0ea10cfa
 else
     LIBVLCJNI_TESTED_HASH=6691a43c73df3abe3e30bda139c6a7b4d1adda87
 fi