diff --git a/buildinfo/mingw.txt b/buildinfo/mingw.txt
index 341b3f9c..1d2fb4e6 100644
--- a/buildinfo/mingw.txt
+++ b/buildinfo/mingw.txt
@@ -4,7 +4,7 @@ Windows 10.0.20348
 Ressource Hacker 5.2.7.427
 7-Zip 23.01 ultra compression
 Git 2.44.0.1
-OpenCLonD3D12 ICD 2024.03.06
+OpenCLonD3D12 ICD 2024.03.26
 
 MSYS2 environment
 -----------------
@@ -30,7 +30,7 @@ gdbm 1.23-1
 getent 2.18.90-4
 gettext 0.22.4-1
 gmp 6.3.0-1
-gnupg 2.4.4-1
+gnupg 2.4.5-1
 grep 1~3.0-6
 gzip 1.13-1
 heimdal-libs 7.8.0-4
@@ -44,7 +44,7 @@ libbz2 1.0.8-4
 libcurl 8.6.0-1
 libdb 5.3.28-5
 libedit 20221030_3.1-1
-libexpat 2.6.1-1
+libexpat 2.6.2-1
 libffi 3.4.6-1
 libgcrypt 1.10.3-1
 libgdbm 1.23-1
@@ -81,25 +81,25 @@ mingw-w64-i686-brotli 1.1.0-1
 mingw-w64-i686-bzip2 1.0.8-3
 mingw-w64-i686-c-ares 1.27.0-1
 mingw-w64-i686-ca-certificates 20240203-1
-mingw-w64-i686-clang 17.0.6-7
-mingw-w64-i686-clang-libs 17.0.6-7
-mingw-w64-i686-cmake 3.28.3-2
-mingw-w64-i686-crt-git 11.0.0.r652.g1ec7fa221-1
-mingw-w64-i686-curl 8.6.0-1
-mingw-w64-i686-directx-headers 1.611.0-2
-mingw-w64-i686-expat 2.6.1-2
+mingw-w64-i686-clang 18.1.2-1
+mingw-w64-i686-clang-libs 18.1.2-1
+mingw-w64-i686-cmake 3.29.0-1
+mingw-w64-i686-crt-git 11.0.0.r655.gdbfdf8025-1
+mingw-w64-i686-curl 8.7.1-1
+mingw-w64-i686-directx-headers 1.613.1-1
+mingw-w64-i686-expat 2.6.2-1
 mingw-w64-i686-gcc 13.2.0-5
 mingw-w64-i686-gcc-libs 13.2.0-5
 mingw-w64-i686-gdb 14.2-1
 mingw-w64-i686-gettext-runtime 0.22.5-2
 mingw-w64-i686-glslang 14.0.0-1
 mingw-w64-i686-gmp 6.3.0-2
-mingw-w64-i686-headers-git 11.0.0.r652.g1ec7fa221-1
+mingw-w64-i686-headers-git 11.0.0.r655.gdbfdf8025-1
 mingw-w64-i686-isl 0.26-1
 mingw-w64-i686-jsoncpp 1.9.5-3
 mingw-w64-i686-libarchive 3.7.2-1
 mingw-w64-i686-libb2 0.98.1-2
-mingw-w64-i686-libclc 17.0.1-1
+mingw-w64-i686-libclc 18.1.0-1
 mingw-w64-i686-libelf 0.8.13-7
 mingw-w64-i686-libffi 3.4.6-1
 mingw-w64-i686-libiconv 1.17-4
@@ -111,13 +111,13 @@ mingw-w64-i686-libtasn1 4.19.0-1
 mingw-w64-i686-libtre-git r177.07e66d0-2
 mingw-w64-i686-libunistring 1.1-1
 mingw-w64-i686-libuv 1.48.0-1
-mingw-w64-i686-libva 2.20.0-2
-mingw-w64-i686-libwinpthread-git 11.0.0.r652.g1ec7fa221-1
-mingw-w64-i686-libxml2 2.12.5-1
-mingw-w64-i686-llvm 17.0.6-7
-mingw-w64-i686-llvm-libs 17.0.6-7
+mingw-w64-i686-libva 2.21.0-1
+mingw-w64-i686-libwinpthread-git 11.0.0.r655.gdbfdf8025-1
+mingw-w64-i686-libxml2 2.12.6-1
+mingw-w64-i686-llvm 18.1.2-1
+mingw-w64-i686-llvm-libs 18.1.2-1
 mingw-w64-i686-lz4 1.9.4-1
-mingw-w64-i686-meson 1.3.2-2
+mingw-w64-i686-meson 1.4.0-2
 mingw-w64-i686-mpc 1.3.1-2
 mingw-w64-i686-mpdecimal 4.0.0-1
 mingw-w64-i686-mpfr 4.2.1-2
@@ -127,52 +127,52 @@ mingw-w64-i686-ninja 1.11.1-3
 mingw-w64-i686-openssl 3.2.1-1
 mingw-w64-i686-p11-kit 0.25.3-2
 mingw-w64-i686-pkgconf 1~2.1.1-1
-mingw-w64-i686-polly 17.0.6-1
+mingw-w64-i686-polly 18.1.2-1
 mingw-w64-i686-python 3.11.8-1
 mingw-w64-i686-python-mako 1.3.2-1
 mingw-w64-i686-python-markupsafe 2.1.5-1
 mingw-w64-i686-readline 8.2.010-1
 mingw-w64-i686-rhash 1.4.4-3
-mingw-w64-i686-spirv-headers 2~1.3.275.0-1
-mingw-w64-i686-spirv-llvm-translator 17.0.0-1
-mingw-w64-i686-spirv-tools 3~1.3.275.0-1
+mingw-w64-i686-spirv-headers 2~1.3.280.0-1
+mingw-w64-i686-spirv-llvm-translator 18.1.0-2
+mingw-w64-i686-spirv-tools 3~1.3.280.0-1
 mingw-w64-i686-sqlite3 3.45.2-1
 mingw-w64-i686-tcl 8.6.13-1
 mingw-w64-i686-termcap 1.3.1-7
 mingw-w64-i686-tk 8.6.12-2
 mingw-w64-i686-tzdata 2024a-1
-mingw-w64-i686-vulkan-headers 1.3.275.0-1
-mingw-w64-i686-vulkan-loader 1.3.275.0-1
+mingw-w64-i686-vulkan-headers 1.3.280.0-1
+mingw-w64-i686-vulkan-loader 1.3.280.0-1
 mingw-w64-i686-windows-default-manifest 6.4-4
-mingw-w64-i686-winpthreads-git 11.0.0.r652.g1ec7fa221-1
+mingw-w64-i686-winpthreads-git 11.0.0.r655.gdbfdf8025-1
 mingw-w64-i686-xxhash 0.8.2-2
 mingw-w64-i686-xz 5.6.1-1
 mingw-w64-i686-zlib 1.3.1-1
-mingw-w64-i686-zstd 1.5.5-1
+mingw-w64-i686-zstd 1.5.6-1
 mingw-w64-ucrt-x86_64-binutils 2.42-1
 mingw-w64-ucrt-x86_64-brotli 1.1.0-1
 mingw-w64-ucrt-x86_64-bzip2 1.0.8-3
 mingw-w64-ucrt-x86_64-c-ares 1.27.0-1
 mingw-w64-ucrt-x86_64-ca-certificates 20240203-1
-mingw-w64-ucrt-x86_64-clang 17.0.6-7
-mingw-w64-ucrt-x86_64-clang-libs 17.0.6-7
-mingw-w64-ucrt-x86_64-cmake 3.28.3-2
-mingw-w64-ucrt-x86_64-crt-git 11.0.0.r652.g1ec7fa221-1
-mingw-w64-ucrt-x86_64-curl 8.6.0-1
-mingw-w64-ucrt-x86_64-directx-headers 1.611.0-2
-mingw-w64-ucrt-x86_64-expat 2.6.1-2
+mingw-w64-ucrt-x86_64-clang 18.1.2-1
+mingw-w64-ucrt-x86_64-clang-libs 18.1.2-1
+mingw-w64-ucrt-x86_64-cmake 3.29.0-1
+mingw-w64-ucrt-x86_64-crt-git 11.0.0.r655.gdbfdf8025-1
+mingw-w64-ucrt-x86_64-curl 8.7.1-1
+mingw-w64-ucrt-x86_64-directx-headers 1.613.1-1
+mingw-w64-ucrt-x86_64-expat 2.6.2-1
 mingw-w64-ucrt-x86_64-gcc 13.2.0-5
 mingw-w64-ucrt-x86_64-gcc-libs 13.2.0-5
 mingw-w64-ucrt-x86_64-gdb 14.2-1
 mingw-w64-ucrt-x86_64-gettext-runtime 0.22.5-2
 mingw-w64-ucrt-x86_64-glslang 14.0.0-1
 mingw-w64-ucrt-x86_64-gmp 6.3.0-2
-mingw-w64-ucrt-x86_64-headers-git 11.0.0.r652.g1ec7fa221-1
+mingw-w64-ucrt-x86_64-headers-git 11.0.0.r655.gdbfdf8025-1
 mingw-w64-ucrt-x86_64-isl 0.26-1
 mingw-w64-ucrt-x86_64-jsoncpp 1.9.5-3
 mingw-w64-ucrt-x86_64-libarchive 3.7.2-1
 mingw-w64-ucrt-x86_64-libb2 0.98.1-2
-mingw-w64-ucrt-x86_64-libclc 17.0.1-1
+mingw-w64-ucrt-x86_64-libclc 18.1.0-1
 mingw-w64-ucrt-x86_64-libelf 0.8.13-7
 mingw-w64-ucrt-x86_64-libffi 3.4.6-1
 mingw-w64-ucrt-x86_64-libiconv 1.17-4
@@ -184,13 +184,13 @@ mingw-w64-ucrt-x86_64-libtasn1 4.19.0-1
 mingw-w64-ucrt-x86_64-libtre-git r177.07e66d0-2
 mingw-w64-ucrt-x86_64-libunistring 1.1-1
 mingw-w64-ucrt-x86_64-libuv 1.48.0-1
-mingw-w64-ucrt-x86_64-libva 2.20.0-2
-mingw-w64-ucrt-x86_64-libwinpthread-git 11.0.0.r652.g1ec7fa221-1
-mingw-w64-ucrt-x86_64-libxml2 2.12.5-1
-mingw-w64-ucrt-x86_64-llvm 17.0.6-7
-mingw-w64-ucrt-x86_64-llvm-libs 17.0.6-7
+mingw-w64-ucrt-x86_64-libva 2.21.0-1
+mingw-w64-ucrt-x86_64-libwinpthread-git 11.0.0.r655.gdbfdf8025-1
+mingw-w64-ucrt-x86_64-libxml2 2.12.6-1
+mingw-w64-ucrt-x86_64-llvm 18.1.2-1
+mingw-w64-ucrt-x86_64-llvm-libs 18.1.2-1
 mingw-w64-ucrt-x86_64-lz4 1.9.4-1
-mingw-w64-ucrt-x86_64-meson 1.3.2-2
+mingw-w64-ucrt-x86_64-meson 1.4.0-2
 mingw-w64-ucrt-x86_64-mpc 1.3.1-2
 mingw-w64-ucrt-x86_64-mpdecimal 4.0.0-1
 mingw-w64-ucrt-x86_64-mpfr 4.2.1-2
@@ -200,40 +200,40 @@ mingw-w64-ucrt-x86_64-ninja 1.11.1-3
 mingw-w64-ucrt-x86_64-openssl 3.2.1-1
 mingw-w64-ucrt-x86_64-p11-kit 0.25.3-2
 mingw-w64-ucrt-x86_64-pkgconf 1~2.1.1-1
-mingw-w64-ucrt-x86_64-polly 17.0.6-1
+mingw-w64-ucrt-x86_64-polly 18.1.2-1
 mingw-w64-ucrt-x86_64-python 3.11.8-1
 mingw-w64-ucrt-x86_64-python-mako 1.3.2-1
 mingw-w64-ucrt-x86_64-python-markupsafe 2.1.5-1
 mingw-w64-ucrt-x86_64-readline 8.2.010-1
 mingw-w64-ucrt-x86_64-rhash 1.4.4-3
-mingw-w64-ucrt-x86_64-spirv-headers 2~1.3.275.0-1
-mingw-w64-ucrt-x86_64-spirv-llvm-translator 17.0.0-1
-mingw-w64-ucrt-x86_64-spirv-tools 3~1.3.275.0-1
+mingw-w64-ucrt-x86_64-spirv-headers 2~1.3.280.0-1
+mingw-w64-ucrt-x86_64-spirv-llvm-translator 18.1.0-2
+mingw-w64-ucrt-x86_64-spirv-tools 3~1.3.280.0-1
 mingw-w64-ucrt-x86_64-sqlite3 3.45.2-1
 mingw-w64-ucrt-x86_64-tcl 8.6.13-1
 mingw-w64-ucrt-x86_64-termcap 1.3.1-7
 mingw-w64-ucrt-x86_64-tk 8.6.12-2
 mingw-w64-ucrt-x86_64-tzdata 2024a-1
-mingw-w64-ucrt-x86_64-vulkan-headers 1.3.275.0-1
-mingw-w64-ucrt-x86_64-vulkan-loader 1.3.275.0-1
+mingw-w64-ucrt-x86_64-vulkan-headers 1.3.280.0-1
+mingw-w64-ucrt-x86_64-vulkan-loader 1.3.280.0-1
 mingw-w64-ucrt-x86_64-windows-default-manifest 6.4-4
-mingw-w64-ucrt-x86_64-winpthreads-git 11.0.0.r652.g1ec7fa221-1
+mingw-w64-ucrt-x86_64-winpthreads-git 11.0.0.r655.gdbfdf8025-1
 mingw-w64-ucrt-x86_64-xxhash 0.8.2-2
 mingw-w64-ucrt-x86_64-xz 5.6.1-1
 mingw-w64-ucrt-x86_64-zlib 1.3.1-1
-mingw-w64-ucrt-x86_64-zstd 1.5.5-1
+mingw-w64-ucrt-x86_64-zstd 1.5.6-1
 mintty 1~3.7.1-1
 mpfr 4.2.1-1
 msys2-keyring 1~20231013-1
 msys2-launcher 1.5-1
-msys2-runtime 3.4.10-5
+msys2-runtime 3.4.10-6
 nano 7.2-1
 ncurses 6.4-2
 nettle 3.9.1-1
 openssl 3.2.1-1
 p11-kit 0.25.3-1
 pacman 6.0.2-13
-pacman-contrib 1.10.4-1
+pacman-contrib 1.10.5-1
 pacman-mirrors 20240210-1
 patch 2.7.6-2
 perl 5.38.2-1
diff --git a/buildinfo/msvc.txt b/buildinfo/msvc.txt
index cca74b5d..98a15014 100644
--- a/buildinfo/msvc.txt
+++ b/buildinfo/msvc.txt
@@ -4,7 +4,7 @@ Windows 10.0.20348
 Ressource Hacker 5.2.7.427
 7-Zip 23.01 ultra compression
 Git 2.44.0.1
-Visual Studio Build Tools 2022 v17.9.3
+Visual Studio Build Tools 2022 v17.9.5
 Windows SDK 10.1.22621.3233
 Windows Driver Kit 10.1.22621.2428
 Nuget Commandline tool 6.9.1.3
@@ -18,16 +18,15 @@ meson      1.4.0
 pip        24.0
 setuptools 69.2.0
 
-CMake 3.28.3
+CMake 3.29.0
 Ninja 1.11.1
-LLVM 18.1.1
-Old LLVM 17.0.6
+LLVM 18.1.2
 SPIRV Tools 2024.1.1
 flex 2.6.4
 Bison 3.8.2
-pkgconf 2.1.1
+pkgconf 2.2.0
 zlib 1.3.1
-OpenCLonD3D12 ICD 2024.03.06
+OpenCLonD3D12 ICD 2024.03.26
 libva 2.21.0
 VA-API 1.21.0
-DirectX headers 1.613.0
+DirectX headers 1.613.1
diff --git a/buildscript/modules/pkgconf.cmd b/buildscript/modules/pkgconf.cmd
index 7d7b0c72..981bef64 100644
--- a/buildscript/modules/pkgconf.cmd
+++ b/buildscript/modules/pkgconf.cmd
@@ -16,7 +16,7 @@
 @cd pkgconf
 )
 @IF %gitstate% GTR 0 (
-@git checkout pkgconf-2.1.1
+@git checkout pkgconf-2.2.0
 @echo.
 )
 @IF EXIST pkgconf\pkg-config.exe set buildpkgconf=n
diff --git a/packages.txt b/packages.txt
index 31ddbe5d..a7aad8d2 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,6 +1,6 @@
-mesa3d-24.0.3-development-pack-msvc.7z
-..\mesa3d-24.0.3-release-msvc.7z
-..\mesa3d-24.0.3-debug-info-msvc.7z
-mesa3d-24.0.3-development-pack-mingw.7z
-..\mesa3d-24.0.3-release-mingw.7z
-..\mesa3d-24.0.3-debug-mingw.7z
+mesa3d-24.0.4-development-pack-msvc.7z
+..\mesa3d-24.0.4-release-msvc.7z
+..\mesa3d-24.0.4-debug-info-msvc.7z
+mesa3d-24.0.4-development-pack-mingw.7z
+..\mesa3d-24.0.4-release-mingw.7z
+..\mesa3d-24.0.4-debug-mingw.7z
diff --git a/readme.md b/readme.md
index c2d04896..4748e454 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@
 - [OpenGL context configuration override](#opengl-context-configuration-override)
 - [How to set environment variables](#how-to-set-environment-variables)
 # Downloads
-Mesa 24.0.3 builds with Visual Studio and MSYS2 Mingw-w64 are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases).
+Mesa 24.0.4 builds with Visual Studio and MSYS2 Mingw-w64 are now available in [releases section](https://github.com/pal1000/mesa-dist-win/releases).
 # Sponsorship
 mesa-dist-win project was given a sponsorship that was extended until November 1st 2024. Sponsorship consists in a free VPS to use as build machine with 12 GB RAM, 6 threads [AMD EPYC 7542](https://www.amd.com/en/products/cpu/amd-epyc-7542) and 150 GB NVMe SSD from [Petrosky](https://petrosky.io/pal1000), a virtual private server hosting company thanks to [@Directox01](https://github.com/Directox01).
 
diff --git a/releasenotes.md b/releasenotes.md
index 658b8730..517c86c6 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,3 +1,5 @@
+# 24.0.4
+- Updated Mesa3D to [24.0.4](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.0/docs/relnotes/24.0.4.rst?ref_type=heads&plain=0).
 ### Documentation
 - Document dxil availability in DirectX shader compiler;
 - dozen driver depends on dxil;