diff --git a/pkg.info b/pkg.info
index f82b519..c5b0f88 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,9 +1,51 @@
 name: mesa
 description: Open source implementations of OpenGL, OpenGL ES, Vulkan, OpenCL, and more
-version: 25.2.3
+version: 25.2.4
+revision: 1
 url: https://www.mesa3d.org/
 license: MIT and BSD-3-Clause and SGI-B-2.0
 architecture: any
-depends: ["expat", "gcc-libs", "glibc", "libdrm", "libelf", "libglvnd", "libx11", "libxcb", "libxext", "libxshmfence", "libxfixes", "libxxf86vm", "llvm-libs", "spirv-llvm-translator", "spirv-tools", "zlib", "zstd"]
-make_depends: ["cbindgen", "glslang", "libclc", "libva", "libvdpau", "libxrandr", "llvm", "meson", "python-mako", "python-ply", "python-pyyaml", "python-setuptools", "rust-bindgen", "rustc", "valgrind", "vulkan-loader", "wayland-protocols", "xcb-util-keysyms", "xorgproto"]
 type: source
+depends:
+  - expat
+  - gcc-libs
+  - glibc
+  - libdrm
+  - libelf
+  - libglvnd
+  - libx11
+  - libxcb
+  - libxext
+  - libxshmfence
+  - libxfixes
+  - libxxf86vm
+  - llvm-libs
+  - spirv-llvm-translator
+  - spirv-tools
+  - zlib
+  - zstd
+make_depends:
+  - cbindgen
+  - glslang
+  - libclc
+  - libva
+  - libvdpau
+  - libxrandr
+  - llvm
+  - meson
+  - python-mako
+  - python-ply
+  - python-pyyaml
+  - python-setuptools
+  - rust-bindgen
+  - rustc
+  - valgrind
+  - vulkan-loader
+  - wayland-protocols
+  - xcb-util-keysyms
+  - xorgproto
+downloads:
+  - url: https://archive.mesa3d.org/mesa-${BPM_PKG_VERSION}.tar.xz
+    extract_to_bpm_source: true
+    extract_strip_components: 1
+    checksum: a370b4c549cbfbe646b319e34d73edb50ed883978f5e95133f282f0eae39ab52
diff --git a/source.sh b/source.sh
index 5882df4..d10cbe0 100644
--- a/source.sh
+++ b/source.sh
@@ -2,26 +2,12 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://archive.mesa3d.org/mesa-${BPM_PKG_VERSION}.tar.xz"
-#DOWNLOAD="https://mesa.freedesktop.org/archive/mesa-${BPM_PKG_VERSION}.tar.xz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  mkdir build
-  cd build
-
   # Build only minimal debug info to reduce size
-  export CFLAGS+=" -g1"
-  export CXXFLAGS+=" -g1"
+  export CFLAGS+="${CFLAGS} -g1"
+  export CXXFLAGS"${CXXFLAGS} -g1"
 
   meson setup --prefix=/usr           \
               --libdir=/usr/lib       \
@@ -37,31 +23,27 @@ build() {
               -Dglvnd=enabled                 \
               -Dvalgrind=enabled              \
               -Dlibunwind=disabled            \
-              ..
-  meson compile
+              build
+  meson compile -C build
 }
 
 # The check function is executed in the source directory
 # This function is used to run tests to verify the package has been compiled correctly
 check() {
-  # Disabling tests temporarily until mesa issue #12934 is resolved 
-  exit 0
-  
-  #cd build
-
-  #meson test
+  meson test -C build
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  cd build
-  
-  meson install --destdir="$BPM_OUTPUT"
-  
-  install -d "$BPM_OUTPUT"/usr/share/licenses/mesa
-  cp ../docs/license.rst "$BPM_OUTPUT"/usr/share/licenses/mesa/license.rst
+  meson install -C build --destdir="$BPM_OUTPUT"
 
+  # Install documentation
   install -d "$BPM_OUTPUT"/usr/share/doc/
-  cp -r ../docs/ "$BPM_OUTPUT"/usr/share/doc/mesa
+  cp -r "$BPM_SOURCE"/docs/ "$BPM_OUTPUT"/usr/share/doc/mesa
+  rm "$BPM_OUTPUT"/usr/share/doc/mesa/license.rst
+
+  # Install package
+  install -d "$BPM_OUTPUT"/usr/share/licenses/mesa
+  cp "$BPM_SOURCE"/docs/license.rst "$BPM_OUTPUT"/usr/share/licenses/mesa/license.rst
 }