diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index ad01dab2f39b..337f7c582556 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -1,30 +1,28 @@
 PORTNAME=	libmatekbd
 DISTVERSION=	1.28.0
 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=	MATE keyboard shared library
 WWW=		https://mate-desktop.org/
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 USES=		gettext gmake gnome libtool localbase pathfix \
 		pkgconfig tar:xz xorg
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	mate-desktop
 USE_GNOME=	cairo gtk30 intltool introspection:build
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 PORTSCOUT=	site:https://github.com/mate-desktop/libmatekbd/releases/ limitw:1,even
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.peripherals-keyboard-xkb.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/x11/libmatekbd/distinfo b/x11/libmatekbd/distinfo
index f0b1eada2073..c6bd6da16355 100644
--- a/x11/libmatekbd/distinfo
+++ b/x11/libmatekbd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781563929
-SHA256 (libmatekbd-1.28.0.tar.xz) = 5d2e58483c2b23d33503d24c88f8b90a28cc0189d7e4001b3e273a604f6fe80e
-SIZE (libmatekbd-1.28.0.tar.xz) = 461700
+TIMESTAMP = 1781825349
+SHA256 (mate/libmatekbd-1.28.0.tar.xz) = 5d2e58483c2b23d33503d24c88f8b90a28cc0189d7e4001b3e273a604f6fe80e
+SIZE (mate/libmatekbd-1.28.0.tar.xz) = 461700