diff --git a/Makefile b/Makefile
index 835238958..713cbe90d 100644
--- a/Makefile
+++ b/Makefile
@@ -345,9 +345,9 @@ ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress_block.o
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress.o
 $(ZSTD_OBJS) $(CHDR_OBJS): CFLAGS += -I$(ZSTD) -Wno-unused
 
-OBJS += $(CHDR_OBJS)
+OBJS += $(CHDR_OBJS) $(ZSTD_OBJS)
 ifneq ($(STATIC_LINKING), 1)
-OBJS += $(LZMA_OBJS) $(ZSTD_OBJS)
+OBJS += $(LZMA_OBJS)
 endif
 # ouf... prepend includes to overload headers available in the toolchain
 CFLAGS := -I$(LZMA)/include -I$(CHDR)/include $(CFLAGS)
diff --git a/pico/cd/libchdr b/pico/cd/libchdr
index 0b5a86fe0..e62ac5995 160000
--- a/pico/cd/libchdr
+++ b/pico/cd/libchdr
@@ -1 +1 @@
-Subproject commit 0b5a86fe0c8b64497d7c6cbc23db72fd6fb1b982
+Subproject commit e62ac5995b1c7ef65ece35293914843b8ee57d49