diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index b263bbdbe7ba..0357252c2674 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -1,56 +1,54 @@
 PORTNAME=	mate-desktop
 DISTVERSION=	1.28.2
 PORTREVISION=	1
 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=	Additional UI API for MATE
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2 GFDL LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_GFDL=	${WRKSRC}/COPYING-DOCS
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes
 RUN_DEPENDS=	dconf-editor:devel/dconf-editor
 
 USES=		gettext gmake gnome libtool localbase pathfix \
 		pkgconfig python shebangfix tar:xz xorg
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	mate-desktop
 USE_XORG=	x11 xrandr
 USE_GNOME=	cairo dconf gdkpixbuf gnomeprefix gtk30 \
 		intltool introspection:build
 USE_LDCONFIG=	yes
 PORTSCOUT=	site:https://github.com/mate-desktop/mate-desktop/releases/ limitw:1,even
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.accessibility-keyboard.gschema.xml \
 		org.mate.accessibility-startup.gschema.xml \
 		org.mate.applications-at-mobility.gschema.xml \
 		org.mate.applications-at-visual.gschema.xml \
 		org.mate.applications-browser.gschema.xml \
 		org.mate.applications-calculator.gschema.xml \
 		org.mate.applications-messenger.gschema.xml \
 		org.mate.applications-office.gschema.xml \
 		org.mate.applications-terminal.gschema.xml \
 		org.mate.background.gschema.xml \
 		org.mate.debug.gschema.xml \
 		org.mate.file-views.gschema.xml \
 		org.mate.interface.gschema.xml \
 		org.mate.lockdown.gschema.xml \
 		org.mate.sound.gschema.xml \
 		org.mate.thumbnail-cache.gschema.xml \
 		org.mate.thumbnailers.gschema.xml \
 		org.mate.typing-break.gschema.xml
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/x11/mate-desktop/distinfo b/x11/mate-desktop/distinfo
index e48db45c9d9f..05997255ed67 100644
--- a/x11/mate-desktop/distinfo
+++ b/x11/mate-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781564738
-SHA256 (mate-desktop-1.28.2.tar.xz) = 32bb4b792014b391c1e1b8ae9c18a82b4d447650984b4cba7d28e95564964aa2
-SIZE (mate-desktop-1.28.2.tar.xz) = 1141084
+TIMESTAMP = 1781825357
+SHA256 (mate/mate-desktop-1.28.2.tar.xz) = 32bb4b792014b391c1e1b8ae9c18a82b4d447650984b4cba7d28e95564964aa2
+SIZE (mate/mate-desktop-1.28.2.tar.xz) = 1141084