diff --git a/devel/ccache4/Makefile b/devel/ccache4/Makefile
index 3e10409894c0..5058f8397d5c 100644
--- a/devel/ccache4/Makefile
+++ b/devel/ccache4/Makefile
@@ -1,7 +1,7 @@
 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
@@ -11,17 +11,16 @@ 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
 
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 {} \;