diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 3419272bf599..e3e997069d0d 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,35 +1,30 @@
 PORTNAME=	acpica
-PORTVERSION=	20250404
+PORTVERSION=	20250807
 CATEGORIES=	sysutils devel
-MASTER_SITES=	https://github.com/user-attachments/files/19600803/ \
-		LOCAL/jkim
 PKGNAMESUFFIX=	-tools
-DISTNAME=	${PORTNAME}-unix-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Tools from the ACPI Component Architecture (ACPICA) project
 WWW=		https://www.intel.com/content/www/us/en/developer/topic-technology/open/acpica/overview.html
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
 USES=		gmake
+USE_GITHUB=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/generate/unix
 
 ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpisrc
 ACPICA_TOOLS+=	acpixtract iasl
 
 PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 
 MAKE_ARGS=	HOST=_FreeBSD PROGS="${ACPICA_TOOLS}"
 MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
 
-post-patch:
-	( cd ${WRKSRC}/source/include && ${MV} ACPIXF.H acpixf.h )
-
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
 	    ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index 2540255385b6..d2356f7d7a08 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744255123
-SHA256 (acpica-unix-20250404.tar.gz) = 82599fad1bfb10cbf8cee789b3c8bb385378fcb39e5494c8765c6421a5cfae7e
-SIZE (acpica-unix-20250404.tar.gz) = 2029186
+TIMESTAMP = 1755807001
+SHA256 (acpica-acpica-20250807_GH0.tar.gz) = 971df1f78944e5f3bb314209acbf8a127c0db34b4a3c26e011b4076eba1c2bbc
+SIZE (acpica-acpica-20250807_GH0.tar.gz) = 7609473