diff --git a/devel/ccache4/Makefile b/devel/ccache4/Makefile
index 3e10409894c0..5058f8397d5c 100644
--- a/devel/ccache4/Makefile
+++ b/devel/ccache4/Makefile
@@ -1,112 +1,111 @@
 PORTNAME=	ccache
-DISTVERSIONPREFIX=	v
-DISTVERSION=	4.13.5
+DISTVERSION=	4.13.6
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/ccache/ccache/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	osidorkin@gmail.com
 COMMENT=	Tool to minimize the compile time of C/C++ programs
 WWW=		https://ccache.dev/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPL-3.0.txt
 
-USES=		cmake:noninja compiler:c++17-lang pathfix shebangfix
-USE_GITHUB=	yes
+USES=		cmake:noninja compiler:c++17-lang pathfix shebangfix tar:xz
 
 SHEBANG_FILES=	doc/scripts/* test/*
 SHEBANG_GLOB=	*.sh *.bash
 
-CMAKE_ARGS+=	-D DEPS=LOCAL
-CMAKE_OFF=	WARNINGS_AS_ERRORS \
-		ENABLE_IPO \
+CMAKE_ARGS=	-D DEPS=LOCAL
+CMAKE_OFF=	ENABLE_IPO \
 		ENABLE_TRACING \
-		REDIS_STORAGE_BACKEND
+		REDIS_STORAGE_BACKEND \
+		WARNINGS_AS_ERRORS
 
 CONFLICTS_INSTALL?=	ccache ccache-static
 
 # Prevent infinite recursion.
 NO_CCACHE_DEPEND=	yes
 SUB_FILES=	ccache_clean ccache-update-links.sh world-ccache
 
 PORTDOCS=	AUTHORS.html AUTHORS.md LICENSE.md MANUAL.html MANUAL.md \
 		NEWS.html NEWS.md authors.adoc manual.adoc news.adoc
 
 OPTIONS_DEFINE=		CLANGLINK DOCS LLVMLINK STATIC TEST
 OPTIONS_DEFAULT=	CLANGLINK LLVMLINK STATIC
 OPTIONS_SUB=		yes
 
 CLANGLINK_DESC=		Create clang compiler links if clang is installed
 LLVMLINK_DESC=		Create llvm compiler links if llvm is installed
 
 DOCS_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
 			bash:shells/bash \
 			pandoc:textproc/hs-pandoc
 DOCS_USES=		groff:run perl5
 DOCS_CMAKE_BOOL=	ENABLE_DOCUMENTATION
 DOCS_ALL_TARGET=	all doc
 
 STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libzstd.a:archivers/zstd \
 			${LOCALBASE}/lib/libxxhash.a:devel/xxhash
 STATIC_LIB_DEPENDS_OFF=	libzstd.so:archivers/zstd \
 			libfmt.so:devel/libfmt \
 			libxxhash.so:devel/xxhash
 STATIC_CMAKE_BOOL=	STATIC_LINK
 STATIC_CMAKE_ON=	-D DEP_BLAKE3=BUNDLED -D DEP_CPPHTTPLIB=BUNDLED \
 			-D DEP_FMT=BUNDLED -D DEP_NONSTDSPAN=BUNDLED \
 			-D DEP_TLEXPECTED=BUNDLED
 STATIC_LDFLAGS=		-static
 
 TEST_BUILD_DEPENDS=	doctest>=2.4.6:devel/doctest
 TEST_TEST_DEPENDS=	bash:shells/bash \
 			objdump:devel/binutils
 TEST_USES=		perl5
 TEST_CMAKE_BOOL=	ENABLE_TESTING
 TEST_TEST_TARGET=	check
 
 .include <bsd.port.pre.mk>
 
 CCLINKDIR=		libexec/ccache
 PLIST_SUB+=		CCLINKDIR="${CCLINKDIR}"
 
 .if ${ARCH}=="i386"
 CCACHE_COMPILERS+=	icc icpc
 .endif
 
 GNU_COMPILERS+=		12 13 14 15 16
 CCACHE_COMPILERS+=	cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} \
 			${GNU_COMPILERS:S|^|g++|} \
 			${GNU_COMPILERS:S|^|cpp|}
 
 .if ${PORT_OPTIONS:MCLANGLINK}
 CLANG_COMPILERS+=	12 13 14 15 16 17 18 19 20 21 22 -devel
 CCACHE_COMPILERS+=	clang clang++ ${CLANG_COMPILERS:S|^|clang|} \
 			${CLANG_COMPILERS:S|^|clang++|} \
 			${CLANG_COMPILERS:S|^|cpp|}
 .endif
 
 .if ${PORT_OPTIONS:MLLVMLINK}
 CCACHE_COMPILERS+=	llvm-gcc llvm-c++ llvm-g++
 .endif
 
 CCACHE_COMPILERS+=	${EXTRA_COMPILERS}
 SUB_LIST+=		CCACHE_COMPILERS="${CCACHE_COMPILERS}" \
 			CCLINKDIR="${CCLINKDIR}"
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world
 	${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \
 		${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache
 	${INSTALL_SCRIPT} ${WRKDIR}/ccache-update-links.sh \
 		${STAGEDIR}${PREFIX}/bin/ccache-update-links
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/ccache_clean \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.adoc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.adoc ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/ccache4/distinfo b/devel/ccache4/distinfo
index e2d5fe8e5a8b..2bdd53e5b008 100644
--- a/devel/ccache4/distinfo
+++ b/devel/ccache4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777311106
-SHA256 (ccache-ccache-v4.13.5_GH0.tar.gz) = 99478c1b55b9c097baceef4cc559931bd2aff8dd43920df1a8cbb7445f23d1f1
-SIZE (ccache-ccache-v4.13.5_GH0.tar.gz) = 753491
+TIMESTAMP = 1778382657
+SHA256 (ccache-4.13.6.tar.xz) = a7de667ca08cf67c3c8af9f213f6aa701a1188a2b3163fb74483858ce5e79fbb
+SIZE (ccache-4.13.6.tar.xz) = 538628
diff --git a/devel/ccache4/pkg-plist b/devel/ccache4/pkg-plist
index 2c38f9ed3203..d9ad88afe4bd 100644
--- a/devel/ccache4/pkg-plist
+++ b/devel/ccache4/pkg-plist
@@ -1,10 +1,10 @@
-etc/periodic/daily/ccache_clean
 bin/ccache
 bin/ccache-update-links
-%%PORTDOCS%%share/man/man1/ccache.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.adoc
+etc/periodic/daily/ccache_clean
 %%CCLINKDIR%%/world/ccache
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.adoc
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
+%%PORTDOCS%%share/man/man1/ccache.1.gz
 @postexec echo "Create compiler links..."
 @postexec %D/bin/ccache-update-links -v
 @preunexec find %D/%%CCLINKDIR%% -type l -exec rm -f {} \;