diff --git a/.gitmodules b/.gitmodules
index 275c9ff2..959573e8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule "graphene"]
 	path = graphene
 	url = https://github.com/ebassi/graphene
+[submodule "glslang"]
+	path = glslang
+	url = https://github.com/KhronosGroup/glslang
diff --git a/Makefile.in b/Makefile.in
index 2e6ddbea..e56aa190 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -615,6 +615,15 @@ $(eval $(call rules-cmake,vulkan-loader,32,CROSS))
 $(eval $(call rules-cmake,vulkan-loader,64,CROSS))
 
 
+##
+## glslang
+##
+
+$(eval $(call rules-source,glslang,$(SRCDIR)/glslang))
+$(eval $(call rules-cmake,glslang,32))
+$(eval $(call rules-cmake,glslang,64))
+
+
 ##
 ## lsteamclient
 ##
@@ -767,6 +776,7 @@ $(OBJ)/.vrclient-post-source:
 
 DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
 DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
+DXVK_DEPENDS = glslang
 
 $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
 $(eval $(call rules-meson,dxvk,32,CROSS))
@@ -855,6 +865,7 @@ VKD3D_PROTON_SOURCE_ARGS = \
 
 VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
 VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton
+VKD3D_PROTON_DEPENDS = glslang
 
 $(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton))
 $(eval $(call rules-meson,vkd3d-proton,32,CROSS))
diff --git a/glslang b/glslang
new file mode 160000
index 00000000..df7fec2c
--- /dev/null
+++ b/glslang
@@ -0,0 +1 @@
+Subproject commit df7fec2cfa966919172ee83bfcae6c9c9b3f91b8
diff --git a/glslang/bin/glslangValidator b/glslang/bin/glslangValidator
deleted file mode 100755
index 10c7a695..00000000
Binary files a/glslang/bin/glslangValidator and /dev/null differ
diff --git a/make/rules-common.mk b/make/rules-common.mk
index ea03d77f..115c2b03 100644
--- a/make/rules-common.mk
+++ b/make/rules-common.mk
@@ -124,7 +124,7 @@ $(2)_ENV$(3) = \
     RC="$$(TARGET_CROSS$(3))-windres" \
     WIDL="$$(TARGET_CROSS$(3))-widl" \
     PKG_CONFIG="$$(TARGET_$(3))-pkg-config" \
-    PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$(SRC)/glslang/bin:$$$$PATH" \
+    PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$$$PATH" \
     LD_LIBRARY_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))),,:)$$$$LD_LIBRARY_PATH" \
     PKG_CONFIG_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))/pkgconfig))" \
     PKG_CONFIG_LIBDIR="/usr/lib/$$(PKG_CONFIG_TARGET_$(4)$(3))/pkgconfig:/usr/share/pkgconfig" \