diff --git a/devel/libchdr/Makefile b/devel/libchdr/Makefile
index a5ca39c65376..3a1711fdc544 100644
--- a/devel/libchdr/Makefile
+++ b/devel/libchdr/Makefile
@@ -1,26 +1,29 @@
 PORTNAME=	libchdr
-DISTVERSION=	g20241111
+DISTVERSION=	g20241211
 CATEGORIES=	devel
 
 MAINTAINER=	bsdcode@disroot.org
 COMMENT=	Standalone library for reading MAME CHDv1-v5 formats
 WWW=		https://github.com/rtissera/libchdr
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
-USES=		cmake pathfix pkgconfig
+USES=		cmake pathfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	rtissera
-GH_TAGNAME=	b3974651d869c2f804e9879b063c23280d2ae617
+GH_TAGNAME=	cb077337d53392454e7100a0fd07139ca678e527
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_LTO=${defined(WITH_LTO):?ON:OFF}
 CMAKE_ON=	INSTALL_STATIC_LIBS WITH_SYSTEM_ZLIB WITH_SYSTEM_ZSTD
 
+EXTRACT_AFTER_ARGS=	--exclude deps/zlib* --exclude deps/zstd* \
+			--no-same-owner --no-same-permissions
+
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libchdr-static.a ${STAGEDIR}${PREFIX}/lib/libchdr.a
 
 .include <bsd.port.mk>
diff --git a/devel/libchdr/distinfo b/devel/libchdr/distinfo
index 129e3d7d1f45..b2b8f453e2ac 100644
--- a/devel/libchdr/distinfo
+++ b/devel/libchdr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731325563
-SHA256 (rtissera-libchdr-g20241111-b3974651d869c2f804e9879b063c23280d2ae617_GH0.tar.gz) = e17270412aaa7158073ec6d8e6287f80a64354ba2b4edbd5786f2d8571f9e787
-SIZE (rtissera-libchdr-g20241111-b3974651d869c2f804e9879b063c23280d2ae617_GH0.tar.gz) = 4222329
+TIMESTAMP = 1735293098
+SHA256 (rtissera-libchdr-g20241211-cb077337d53392454e7100a0fd07139ca678e527_GH0.tar.gz) = 7c612f4b879295bf82d0dc481c0c055fc1cceefe56b5dea1b094b0dde0952392
+SIZE (rtissera-libchdr-g20241211-cb077337d53392454e7100a0fd07139ca678e527_GH0.tar.gz) = 4222519
diff --git a/devel/libchdr/files/patch-CMakeLists.txt b/devel/libchdr/files/patch-CMakeLists.txt
index 80417eff28fc..8be0f47bd952 100644
--- a/devel/libchdr/files/patch-CMakeLists.txt
+++ b/devel/libchdr/files/patch-CMakeLists.txt
@@ -1,26 +1,11 @@
---- CMakeLists.txt.orig	2024-11-12 19:29:11 UTC
+--- CMakeLists.txt.orig	2024-12-30 08:57:04 UTC
 +++ CMakeLists.txt
-@@ -51,8 +51,12 @@ if (WITH_SYSTEM_ZSTD)
- 
- # zstd
- if (WITH_SYSTEM_ZSTD)
--  find_package(zstd REQUIRED)
--  list(APPEND PLATFORM_LIBS zstd::libzstd_shared)
-+  # find_package(zstd) fails on i386 because of a known problem with the
-+  # provided cmake module. Use pkg_check_modules instead.
-+  find_package(PkgConfig REQUIRED)
-+  pkg_check_modules(zstd REQUIRED libzstd)
-+  list(APPEND CHDR_INCLUDES ${zstd_INCLUDE_DIRS})
-+  list(APPEND PLATFORM_LIBS ${zstd_LINK_LIBRARIES})
- else()
-   option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
-   option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
-@@ -83,7 +87,7 @@ if (INSTALL_STATIC_LIBS)
+@@ -83,7 +83,7 @@ if (INSTALL_STATIC_LIBS)
  endif()
  
  if (INSTALL_STATIC_LIBS)
 -  install(TARGETS chdr-static ${CHDR_LIBS}
 +  install(TARGETS chdr-static
      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
    )
  endif()