diff --git a/x11-wm/marco/Makefile b/x11-wm/marco/Makefile
index 782d06f8e17a..6a6a2b9a8ad0 100644
--- a/x11-wm/marco/Makefile
+++ b/x11-wm/marco/Makefile
@@ -1,39 +1,37 @@
 PORTNAME=	marco
 DISTVERSION=	1.28.1
 PORTREVISION=	1
 CATEGORIES=	x11-wm 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=	Window manager for the adult in you
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool \
 		zenity>=3.0.0:x11/zenity
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 		libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libgtop-2.0.so:devel/libgtop
 RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 USES=		gettext gmake gnome libtool localbase pathfix pkgconfig \
 		tar:xz xorg mate
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	mate-desktop
 USE_XORG=	ice sm x11 xcomposite xcursor xdamage xext xfixes \
 		xinerama xrandr xrender xres
 USE_GNOME=	cairo gdkpixbuf gtk30 intltool
 USE_MATE=	desktop
 USE_LDCONFIG=	yes
 PORTSCOUT=	site:https://github.com/mate-desktop/marco/releases/ limitw:1,even
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.marco.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/x11-wm/marco/distinfo b/x11-wm/marco/distinfo
index 6002bbb8abb3..976fbe63a632 100644
--- a/x11-wm/marco/distinfo
+++ b/x11-wm/marco/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781563114
-SHA256 (marco-1.28.1.tar.xz) = 2496e5e40ee980cd6849493ac3e0f8fd0dec8b81c674da8d9ba19a577f0ac2e1
-SIZE (marco-1.28.1.tar.xz) = 1800320
+TIMESTAMP = 1781825345
+SHA256 (mate/marco-1.28.1.tar.xz) = 2496e5e40ee980cd6849493ac3e0f8fd0dec8b81c674da8d9ba19a577f0ac2e1
+SIZE (mate/marco-1.28.1.tar.xz) = 1800320