diff --git a/.gitmodules b/.gitmodules
index 7ab10b0ec9..6b64143ea8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,7 +46,7 @@
 	url = https://github.com/google/cpu_features.git
 [submodule "ext/rcheevos"]
 	path = ext/rcheevos
-	url = https://github.com/RetroAchievements/rcheevos.git
+	url = https://github.com/hrydgard/rcheevos.git
 [submodule "ext/naett"]
 	path = ext/naett
 	url = https://github.com/erkkah/naett.git
diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
index 579eb8942a..9094e1bed2 100644
--- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
+++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj
@@ -72,7 +72,6 @@
     <ClCompile Include="..\..\ext\rcheevos\src\rcheevos\runtime_progress.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rcheevos\trigger.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rcheevos\value.c" />
-    <ClCompile Include="..\..\ext\rcheevos\src\rhash\aes.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rhash\cdreader.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rhash\hash.c" />
     <ClCompile Include="..\..\ext\rcheevos\src\rhash\md5.c" />
@@ -129,4 +128,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
index d1cf705265..b1f493b0e1 100644
--- a/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
+++ b/UWP/rcheevos_UWP/rcheevos_UWP.vcxproj.filters
@@ -155,8 +155,5 @@
     <ClCompile Include="..\..\ext\rcheevos\src\rc_util.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\rcheevos\src\rhash\aes.c">
-      <Filter>rhash</Filter>
-    </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ext/rcheevos b/ext/rcheevos
index e7989c3002..88a671e309 160000
--- a/ext/rcheevos
+++ b/ext/rcheevos
@@ -1 +1 @@
-Subproject commit e7989c300280ba06d7621ae5b4e00ac7fe28d97a
+Subproject commit 88a671e3091b8a02cdda136d4de0345524fd2387
diff --git a/ext/rcheevos-build/CMakeLists.txt b/ext/rcheevos-build/CMakeLists.txt
index 52748c82e8..5638df3750 100644
--- a/ext/rcheevos-build/CMakeLists.txt
+++ b/ext/rcheevos-build/CMakeLists.txt
@@ -38,7 +38,6 @@ set(ALL_SOURCE_FILES
 	# rhash
 	${SRC_DIR}/rhash/cdreader.c
 	${SRC_DIR}/rhash/hash.c
-	${SRC_DIR}/rhash/aes.c
 	${SRC_DIR}/rhash/md5.c
 	${SRC_DIR}/rhash/md5.h
 	)
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 611be9130a..1bcd8ab2b9 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -220,7 +220,6 @@ SOURCES_C += \
 	$(EXTDIR)/rcheevos/src/rcheevos/runtime_progress.c \
 	$(EXTDIR)/rcheevos/src/rcheevos/trigger.c \
 	$(EXTDIR)/rcheevos/src/rcheevos/value.c \
-	$(EXTDIR)/rcheevos/src/rhash/aes.c \
 	$(EXTDIR)/rcheevos/src/rhash/cdreader.c \
 	$(EXTDIR)/rcheevos/src/rhash/hash.c \
 	$(EXTDIR)/rcheevos/src/rhash/md5.c