diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index e4ce2326d79f..2bc50bac2f76 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -1,45 +1,43 @@
 PORTNAME=	caja
 DISTVERSION=	1.28.0
 PORTREVISION=	5
 CATEGORIES=	x11-fm mate
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	https://github.com/mate-desktop/${PORTNAME}/releases/download/v${DISTVERSION}/
+DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	File manager for the MATE desktop
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libexempi.so:textproc/exempi \
 		libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer \
 		libstartup-notification-1.so:x11/startup-notification \
 		libnotify.so:devel/libnotify
 
 USES=		compiler:c11 desktop-file-utils gettext gmake gnome libtool \
 		localbase mate pathfix pkgconfig shared-mime-info tar:xz xorg
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	mate-desktop
 USE_MATE=	desktop icontheme:run
 USE_XORG=	ice sm x11
 USE_GNOME=	cairo gtk30 gnomeprefix intltool introspection:build libxml2 \
 		gvfs
 USE_LDCONFIG=	yes
 PORTSCOUT=	site:https://github.com/mate-desktop/caja/releases/ limitw:1,even
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-packagekit \
 		--disable-update-mimedb
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.caja.gschema.xml \
 		org.mate.media-handling.gschema.xml
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/caja/extensions-2.0
 
 .include <bsd.port.mk>
diff --git a/x11-fm/caja/distinfo b/x11-fm/caja/distinfo
index 55c7b8593221..6e8d08d5ac4f 100644
--- a/x11-fm/caja/distinfo
+++ b/x11-fm/caja/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781554992
-SHA256 (caja-1.28.0.tar.xz) = 1e3014ce1455817ec2ef74d09efdfb6835d8a372ed9a16efb5919ef7b821957a
-SIZE (caja-1.28.0.tar.xz) = 5332720
+TIMESTAMP = 1781825323
+SHA256 (mate/caja-1.28.0.tar.xz) = 1e3014ce1455817ec2ef74d09efdfb6835d8a372ed9a16efb5919ef7b821957a
+SIZE (mate/caja-1.28.0.tar.xz) = 5332720