diff --git a/archivers/engrampa/Makefile b/archivers/engrampa/Makefile
index 440108434361..14f58d0b7b97 100644
--- a/archivers/engrampa/Makefile
+++ b/archivers/engrampa/Makefile
@@ -1,38 +1,42 @@
 PORTNAME=	engrampa
-PORTVERSION=	1.28.2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.28.2
 CATEGORIES=	archivers mate
-MASTER_SITES=	MATE
-DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Archive manager for zip files, tar, etc
 WWW=		https://mate-desktop.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	itstool:textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		${LOCALBASE}/share/aclocal/ax_require_defined.m4:devel/autoconf-archive \
+		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:archivers/gtar \
 		${LOCALBASE}/bin/unzip:archivers/unzip
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake gnome libtool localbase \
-		mate pkgconfig tar:xz
-USE_MATE=	caja
+USE_GITHUB=	yes
+GH_ACCOUNT=	mate-desktop
+GH_TUPLE=	mate-desktop:mate-submodules:54fff1b:submodules/mate-submodules
+USES=		autoreconf desktop-file-utils gettext gmake gnome libtool localbase \
+		mate pkgconfig
+USE_MATE=	caja common:build
 USE_GNOME=	cairo gtk30 intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-packagekit
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.mate.engrampa.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/fr-command-tar.c \
 		${WRKSRC}/src/fr-command-zip.c
 
 .include <bsd.port.mk>
diff --git a/archivers/engrampa/distinfo b/archivers/engrampa/distinfo
index 343589e2a8cd..262f514615fc 100644
--- a/archivers/engrampa/distinfo
+++ b/archivers/engrampa/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1728249295
-SHA256 (mate/engrampa-1.28.2.tar.xz) = 1e9977c23745bf8843a37f315171d9af97814a0971aeac3d774f017650ac09ef
-SIZE (mate/engrampa-1.28.2.tar.xz) = 1729320
+TIMESTAMP = 1779757390
+SHA256 (mate-desktop-engrampa-v1.28.2_GH0.tar.gz) = 65a490c37ac2b92e491d247b62e96104a6b2c404c834c689256be7d68769bc0b
+SIZE (mate-desktop-engrampa-v1.28.2_GH0.tar.gz) = 3791622
+SHA256 (mate-desktop-mate-submodules-54fff1b_GH0.tar.gz) = 66cde56dacbd15b7134f51c0f80e6567ee7af05157711ce3ef49973718433b7b
+SIZE (mate-desktop-mate-submodules-54fff1b_GH0.tar.gz) = 33344