diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index 00df21958d3a..7ebd07e6c0ea 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -1,65 +1,63 @@
 PORTNAME=	mate-screensaver
 DISTVERSION=	1.28.0
 PORTREVISION=	3
 CATEGORIES=	x11 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=	MATE screen saver and locker
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify \
 		libstartup-notification-1.so:x11/startup-notification
 
 USES=		gettext gl gmake gnome localbase mate pathfix pkgconfig tar:xz \
 		xorg
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	mate-desktop
 USE_GL=		gl
 USE_MATE=	desktop libmatekbd menus session:run
 USE_XORG=	ice sm x11 xext xscrnsaver xxf86vm
 USE_GNOME=	cairo gdkpixbuf gtk30 intltool
 PORTSCOUT=	site:https://github.com/mate-desktop/mate-screensaver/releases/ limitw:1,even
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-console-kit=yes \
 		--with-systemd=no
 
 GLIB_SCHEMAS=	org.mate.screensaver.gschema.xml
 
 SUB_FILES+=	mate-screensaver.pam
 
 SCREENSAVER_DIR=	share/applications/screensavers
 
 OPTIONS_DEFINE=	PAM
 OPTIONS_DEFAULT=PAM
 OPTIONS_SUB=	yes
 
 PAM_RUN_DEPENDS=	mate_pam_helper:security/mate-pam-helper
 PAM_CONFIGURE_ON=	--enable-authentication-scheme=helper \
 			--with-passwd-helper=${LOCALBASE}/bin/mate_pam_helper
 PAM_CONFIGURE_OFF=	--disable-pam
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if ${PORT_OPTIONS:MPAM}
 	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
 		${WRKSRC}/src/gs-auth-pam.c
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
 .if ${PORT_OPTIONS:MPAM}
 	${INSTALL_DATA} ${WRKDIR}/mate-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/mate-screensaver
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index 36d6b0f63a7b..5058b5837ae8 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781606247
-SHA256 (mate-screensaver-1.28.0.tar.xz) = 6a0f24a8f84a2f95e10114ab53e63fd4aca688a55fdc503ed650e0a410e3ea70
-SIZE (mate-screensaver-1.28.0.tar.xz) = 5108156
+TIMESTAMP = 1781825375
+SHA256 (mate/mate-screensaver-1.28.0.tar.xz) = 6a0f24a8f84a2f95e10114ab53e63fd4aca688a55fdc503ed650e0a410e3ea70
+SIZE (mate/mate-screensaver-1.28.0.tar.xz) = 5108156