diff --git a/pkg.info b/pkg.info
index 0b45796..12714f2 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,9 +1,20 @@
 name: glslang
 description: OpenGL and OpenGL ES shader front end and validator
-version: 15.4.0
+version: 16.0.0
+revision: 1
 url: https://github.com/KhronosGroup/glslang
 license: BSD-3-Clause
 architecture: any
-depends: ["gcc-libs", "spirv-tools"]
-make_depends: ["cmake", "ninja", "python3", "spirv-headers"]
 type: source
+depends:
+  - gcc-libs
+  - spirv-tools
+make_depends:
+  - cmake
+  - python3
+  - spirv-headers
+downloads:
+  - url: https://github.com/KhronosGroup/glslang/archive/refs/tags/${BPM_PKG_VERSION}/glslang-${BPM_PKG_VERSION}.tar.gz
+    extract_to_bpm_source: true
+    extract_strip_components: 1
+    checksum: 172385478520335147d3b03a1587424af0935398184095f24beab128a254ecc7
diff --git a/source.sh b/source.sh
index 1a314eb..2678a85 100644
--- a/source.sh
+++ b/source.sh
@@ -2,43 +2,28 @@
 # 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://github.com/KhronosGroup/glslang/archive/refs/tags/${BPM_PKG_VERSION}/glslang-${BPM_PKG_VERSION}.tar.gz"
-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
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-        -DCMAKE_BUILD_TYPE=Release      \
-        -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
-        -DBUILD_SHARED_LIBS=ON          \
-        -DGLSLANG_TESTS=ON              \
-        -G Ninja ..
-  ninja
+  cmake -B build -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release           \
+        -DALLOW_EXTERNAL_SPIRV_TOOLS=ON      \
+        -DBUILD_SHARED_LIBS=ON               \
+        -DGLSLANG_TESTS=ON
+  cmake --build 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() {
-  cd build
-  ninja test
+  ctest --test-dir 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
-  DESTDIR="$BPM_OUTPUT" ninja install
+  DESTDIR="$BPM_OUTPUT" cmake --install build
 
+  # Install package license
   install -Dm644 "$BPM_SOURCE"/LICENSE.txt "$BPM_OUTPUT"/usr/share/licenses/glslang/LICENSE.txt
 }