diff --git a/.gitmodules b/.gitmodules
index 309bcd18..2a521d70 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 	url = https://github.com/digital-sound-antiques/emu2413.git
 [submodule "pico/cd/libchdr"]
 	path = pico/cd/libchdr
-	url = https://github.com/irixxxx/libchdr-picodrive.git
+	url = https://github.com/rtissera/libchdr.git
 [submodule "platform/common/minimp3"]
 	path = platform/common/minimp3
 	url = https://github.com/lieff/minimp3
diff --git a/pico/cd/libchdr b/pico/cd/libchdr
index ff3175dd..00319cf3 160000
--- a/pico/cd/libchdr
+++ b/pico/cd/libchdr
@@ -1 +1 @@
-Subproject commit ff3175ddb040b1a967c665a28868b16bf5aa97dd
+Subproject commit 00319cf31f034e4d468a49a60265c7c5b8305b70