diff --git a/manifest/armv7l/s/shaderc.filelist b/manifest/armv7l/s/shaderc.filelist
index 181900ae2..4f6a9b896 100644
--- a/manifest/armv7l/s/shaderc.filelist
+++ b/manifest/armv7l/s/shaderc.filelist
@@ -1,9 +1,10 @@
-# Total size: 165298404
+# Total size: 170066305
 /usr/local/bin/glslang
 /usr/local/bin/glslangValidator
 /usr/local/bin/glslc
 /usr/local/bin/spirv-as
 /usr/local/bin/spirv-cfg
+/usr/local/bin/spirv-diff
 /usr/local/bin/spirv-dis
 /usr/local/bin/spirv-lesspipe.sh
 /usr/local/bin/spirv-link
@@ -11,7 +12,6 @@
 /usr/local/bin/spirv-objdump
 /usr/local/bin/spirv-opt
 /usr/local/bin/spirv-reduce
-/usr/local/bin/spirv-remap
 /usr/local/bin/spirv-val
 /usr/local/include/glslang/Include/ResourceLimits.h
 /usr/local/include/glslang/Include/glslang_c_interface.h
@@ -26,7 +26,7 @@
 /usr/local/include/glslang/SPIRV/SPVRemapper.h
 /usr/local/include/glslang/SPIRV/SpvTools.h
 /usr/local/include/glslang/SPIRV/disassemble.h
-/usr/local/include/glslang/SPIRV/spirv.hpp
+/usr/local/include/glslang/SPIRV/spirv.hpp11
 /usr/local/include/glslang/build_info.h
 /usr/local/include/shaderc/env.h
 /usr/local/include/shaderc/shaderc.h
@@ -69,15 +69,18 @@
 /usr/local/lib/libSPIRV-Tools-reduce.a
 /usr/local/lib/libSPIRV-Tools-shared.so
 /usr/local/lib/libSPIRV-Tools.a
+/usr/local/lib/libSPIRV.so
+/usr/local/lib/libSPIRV.so.15
+/usr/local/lib/libSPIRV.so.15.4.0
 /usr/local/lib/libSPVRemapper.so
 /usr/local/lib/libSPVRemapper.so.15
-/usr/local/lib/libSPVRemapper.so.15.1.0
+/usr/local/lib/libSPVRemapper.so.15.4.0
 /usr/local/lib/libglslang-default-resource-limits.so
 /usr/local/lib/libglslang-default-resource-limits.so.15
-/usr/local/lib/libglslang-default-resource-limits.so.15.1.0
+/usr/local/lib/libglslang-default-resource-limits.so.15.4.0
 /usr/local/lib/libglslang.so
 /usr/local/lib/libglslang.so.15
-/usr/local/lib/libglslang.so.15.1.0
+/usr/local/lib/libglslang.so.15.4.0
 /usr/local/lib/libshaderc.a
 /usr/local/lib/libshaderc_combined.a
 /usr/local/lib/libshaderc_shared.so
diff --git a/manifest/i686/s/shaderc.filelist b/manifest/i686/s/shaderc.filelist
deleted file mode 100644
index 6eb97ce5f..000000000
--- a/manifest/i686/s/shaderc.filelist
+++ /dev/null
@@ -1,58 +0,0 @@
-/usr/local/bin/glslc
-/usr/local/bin/spirv-as
-/usr/local/bin/spirv-cfg
-/usr/local/bin/spirv-dis
-/usr/local/bin/spirv-lesspipe.sh
-/usr/local/bin/spirv-link
-/usr/local/bin/spirv-lint
-/usr/local/bin/spirv-objdump
-/usr/local/bin/spirv-opt
-/usr/local/bin/spirv-reduce
-/usr/local/bin/spirv-val
-/usr/local/include/shaderc/env.h
-/usr/local/include/shaderc/shaderc.h
-/usr/local/include/shaderc/shaderc.hpp
-/usr/local/include/shaderc/status.h
-/usr/local/include/shaderc/visibility.h
-/usr/local/include/spirv-tools/instrument.hpp
-/usr/local/include/spirv-tools/libspirv.h
-/usr/local/include/spirv-tools/libspirv.hpp
-/usr/local/include/spirv-tools/linker.hpp
-/usr/local/include/spirv-tools/optimizer.hpp
-/usr/local/lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets.cmake
-/usr/local/lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
-/usr/local/lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets.cmake
-/usr/local/lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake
-/usr/local/lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
-/usr/local/lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsTargets-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsTargets.cmake
-/usr/local/lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
-/usr/local/lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-release.cmake
-/usr/local/lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
-/usr/local/lib/libSPIRV-Tools-diff.a
-/usr/local/lib/libSPIRV-Tools-link.a
-/usr/local/lib/libSPIRV-Tools-lint.a
-/usr/local/lib/libSPIRV-Tools-opt.a
-/usr/local/lib/libSPIRV-Tools-reduce.a
-/usr/local/lib/libSPIRV-Tools-shared.so
-/usr/local/lib/libSPIRV-Tools.a
-/usr/local/lib/libshaderc.a
-/usr/local/lib/libshaderc_combined.a
-/usr/local/lib/libshaderc_shared.so
-/usr/local/lib/libshaderc_shared.so.1
-/usr/local/lib/pkgconfig/SPIRV-Tools-shared.pc
-/usr/local/lib/pkgconfig/SPIRV-Tools.pc
-/usr/local/lib/pkgconfig/shaderc.pc
-/usr/local/lib/pkgconfig/shaderc_combined.pc
-/usr/local/lib/pkgconfig/shaderc_static.pc
diff --git a/manifest/x86_64/s/shaderc.filelist b/manifest/x86_64/s/shaderc.filelist
index b36d321da..3d7d614c1 100644
--- a/manifest/x86_64/s/shaderc.filelist
+++ b/manifest/x86_64/s/shaderc.filelist
@@ -1,9 +1,10 @@
-# Total size: 168970584
+# Total size: 177304909
 /usr/local/bin/glslang
 /usr/local/bin/glslangValidator
 /usr/local/bin/glslc
 /usr/local/bin/spirv-as
 /usr/local/bin/spirv-cfg
+/usr/local/bin/spirv-diff
 /usr/local/bin/spirv-dis
 /usr/local/bin/spirv-lesspipe.sh
 /usr/local/bin/spirv-link
@@ -11,7 +12,6 @@
 /usr/local/bin/spirv-objdump
 /usr/local/bin/spirv-opt
 /usr/local/bin/spirv-reduce
-/usr/local/bin/spirv-remap
 /usr/local/bin/spirv-val
 /usr/local/include/glslang/Include/ResourceLimits.h
 /usr/local/include/glslang/Include/glslang_c_interface.h
@@ -26,7 +26,7 @@
 /usr/local/include/glslang/SPIRV/SPVRemapper.h
 /usr/local/include/glslang/SPIRV/SpvTools.h
 /usr/local/include/glslang/SPIRV/disassemble.h
-/usr/local/include/glslang/SPIRV/spirv.hpp
+/usr/local/include/glslang/SPIRV/spirv.hpp11
 /usr/local/include/glslang/build_info.h
 /usr/local/include/shaderc/env.h
 /usr/local/include/shaderc/shaderc.h
@@ -69,15 +69,18 @@
 /usr/local/lib64/libSPIRV-Tools-reduce.a
 /usr/local/lib64/libSPIRV-Tools-shared.so
 /usr/local/lib64/libSPIRV-Tools.a
+/usr/local/lib64/libSPIRV.so
+/usr/local/lib64/libSPIRV.so.15
+/usr/local/lib64/libSPIRV.so.15.4.0
 /usr/local/lib64/libSPVRemapper.so
 /usr/local/lib64/libSPVRemapper.so.15
-/usr/local/lib64/libSPVRemapper.so.15.1.0
+/usr/local/lib64/libSPVRemapper.so.15.4.0
 /usr/local/lib64/libglslang-default-resource-limits.so
 /usr/local/lib64/libglslang-default-resource-limits.so.15
-/usr/local/lib64/libglslang-default-resource-limits.so.15.1.0
+/usr/local/lib64/libglslang-default-resource-limits.so.15.4.0
 /usr/local/lib64/libglslang.so
 /usr/local/lib64/libglslang.so.15
-/usr/local/lib64/libglslang.so.15.1.0
+/usr/local/lib64/libglslang.so.15.4.0
 /usr/local/lib64/libshaderc.a
 /usr/local/lib64/libshaderc_combined.a
 /usr/local/lib64/libshaderc_shared.so
diff --git a/packages/shaderc.rb b/packages/shaderc.rb
index d15c887b5..7fa6a54ce 100644
--- a/packages/shaderc.rb
+++ b/packages/shaderc.rb
@@ -6,7 +6,7 @@ require 'buildsystems/cmake'
 class Shaderc < CMake
   description 'Collection of tools, libraries and tests for shader compilation'
   homepage 'https://github.com/google/shaderc'
-  version '2025.1'
+  version '2025.4'
   license 'Apache-2.0'
   compatibility 'aarch64 armv7l x86_64'
   source_url 'https://github.com/google/shaderc.git'
@@ -14,10 +14,9 @@ class Shaderc < CMake
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '4d58609c7931481b599123cf4f3ea7d7dd6c0604e05845e6a17f5ac73208fede',
-     armv7l: '4d58609c7931481b599123cf4f3ea7d7dd6c0604e05845e6a17f5ac73208fede',
-       i686: 'd0b7a92f5021b97f5c9e0ec229acae6f2820b8b38a037755c526328458442c7c',
-     x86_64: '652ec3178fd6cdbfa37d86c043bf6e2da1530c11a2892b9e6847ed2aa395b67a'
+    aarch64: '10afd6df640941542e19f92760a8f55895f080949072ac7df1f46ba4456fa627',
+     armv7l: '10afd6df640941542e19f92760a8f55895f080949072ac7df1f46ba4456fa627',
+     x86_64: '00db20c22ac98f17becaf9f8d628b8b50eac78f22011666cd7a63f99dfb24110'
   })
 
   depends_on 'ruby_asciidoctor' => :build
@@ -27,6 +26,8 @@ class Shaderc < CMake
   depends_on 'spirv_headers' => :build
   depends_on 'spirv_tools' # R
 
+  conflicts_ok # conflicts with glslang
+
   def self.patch
     system './utils/git-sync-deps'
   end