diff --git a/.gitmodules b/.gitmodules
index 49f252a8ef..71d65bba2f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "deps/glslang/glslang"]
 	path = deps/glslang/glslang
 	url = git://github.com/KhronosGroup/glslang.git
-[submodule "deps/spir2cross"]
-	path = deps/spir2cross
-	url = git://github.com/ARM-software/spir2cross
+[submodule "deps/SPIRV-Cross"]
+	path = deps/SPIRV-Cross
+	url = git://github.com/KhronosGroup/SPIRV-Cross
diff --git a/Makefile.common b/Makefile.common
index 7ea3441a0f..39c1b13713 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -752,7 +752,7 @@ ifeq ($(HAVE_VULKAN), 1)
 		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
 		$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
 
-	SPIR2CROSS_SOURCES := deps/spir2cross/spir2cross.cpp
+	SPIRV_CROSS_SOURCES := deps/SPIRV-Cross/spirv_cross.cpp
 
 	DEFINES += \
 			  -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
@@ -761,13 +761,13 @@ ifeq ($(HAVE_VULKAN), 1)
 			  -Ideps/glslang/glslang/glslang/Public \
 			  -Ideps/glslang/glslang/SPIRV \
 			  -Ideps/glslang \
-			  -Ideps/spir2cross
+			  -Ideps/SPIRV-Cross
 
 	CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
    CFLAGS  += -I./gfx/include/vulkan
 
 	GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
-	SPIR2CROSS_OBJ := $(SPIR2CROSS_SOURCES:.cpp=.o)
+	SPIRV_CROSS_OBJ := $(SPIRV_CROSS_SOURCES:.cpp=.o)
 
 	OBJ += gfx/drivers/vulkan.o \
 			 gfx/common/vulkan_common.o \
@@ -776,7 +776,7 @@ ifeq ($(HAVE_VULKAN), 1)
 			 gfx/drivers_shader/glslang_util.o \
 			 gfx/drivers_shader/slang_reflection.o \
 			 $(GLSLANG_OBJ) \
-			 $(SPIR2CROSS_OBJ)
+			 $(SPIRV_CROSS_OBJ)
 	ifeq ($(HAVE_MENU_COMMON), 1)
 		OBJ += menu/drivers_display/menu_display_vulkan.o
 	endif
diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross
new file mode 160000
index 0000000000..44ef367141
--- /dev/null
+++ b/deps/SPIRV-Cross
@@ -0,0 +1 @@
+Subproject commit 44ef367141f9935bc719c9cc25693a9055f61efa
diff --git a/gfx/drivers_shader/slang_reflection.cpp b/gfx/drivers_shader/slang_reflection.cpp
index 0715850fb7..748f11e00d 100644
--- a/gfx/drivers_shader/slang_reflection.cpp
+++ b/gfx/drivers_shader/slang_reflection.cpp
@@ -13,14 +13,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "spir2cross.hpp"
+#include "spirv_cross.hpp"
 #include "slang_reflection.hpp"
 #include <vector>
 #include <stdio.h>
 #include "../../verbosity.h"
 
 using namespace std;
-using namespace spir2cross;
+using namespace spirv_cross;
 
 static bool slang_texture_semantic_is_array(slang_texture_semantic sem)
 {