diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index 9f3907c9cec0..b59d1d9c100a 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -1,34 +1,32 @@
 PORTNAME=	mate-system-monitor
 DISTVERSION=	1.28.1
 PORTREVISION=	2
 CATEGORIES=	sysutils 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 system monitor program
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
 		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		compiler:c++11-lib gettext gmake gnome localbase mate \
 		pathfix pkgconfig tar:xz
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	mate-desktop
 USE_MATE=	icontheme
 USE_GNOME=	gtkmm30 intlhack librsvg2 libwnck3 libxml2
 PORTSCOUT=	site:https://github.com/mate-desktop/mate-system-monitor/releases/ limitw:1,even
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-systemd
 CONFIGURE_ENV=	LIBS="-lutil" DATADIRNAME="share"
 
 GLIB_SCHEMAS=	org.mate.system-monitor.enums.xml \
 		org.mate.system-monitor.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/mate-system-monitor/distinfo b/sysutils/mate-system-monitor/distinfo
index 1af8d309310c..6b78305c362b 100644
--- a/sysutils/mate-system-monitor/distinfo
+++ b/sysutils/mate-system-monitor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781263929
-SHA256 (mate-system-monitor-1.28.1.tar.xz) = 42d663d6b90fb5361ebc13f6547983d6f1e2ac75dc2ae4f1cac6ea6329965a25
-SIZE (mate-system-monitor-1.28.1.tar.xz) = 2521892
+TIMESTAMP = 1781825318
+SHA256 (mate/mate-system-monitor-1.28.1.tar.xz) = 42d663d6b90fb5361ebc13f6547983d6f1e2ac75dc2ae4f1cac6ea6329965a25
+SIZE (mate/mate-system-monitor-1.28.1.tar.xz) = 2521892