diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index 29bfe993f306..36dc131987a0 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -1,51 +1,54 @@
 # Created by: Kelly Yancey <kbyanc@posi.net>
 
 PORTNAME=	aee
-PORTVERSION=	2.2.21
-PORTREVISION=	2
+DISTVERSION=	2.2.22
 CATEGORIES=	editors
-MASTER_SITES=	https://BSDforge.com/projects/source/editors/aee/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Easy editor with both curses and X11 interfaces
 
 LICENSE=	ART10
+LICENSE_FILE=	${WRKSRC}/Artistic
 
 USES=		ncurses
 PLIST_FILES=	bin/aee bin/rae man/man1/aee.1.gz ${DATADIR}/help.ae
 ALL_TARGET=	main
 
-MAKE_JOBS_UNSAFE=	yes
+USE_GITLAB=	yes
+GL_ACCOUNT=	ports1
+GL_PROJECT=	aee
+GL_COMMIT=	bf68f4accb96ac39020ac2d9092022aebfa5df27
 
 OPTIONS_DEFINE=	XAE
 
 XAE_DESC=		Build X11 version 'xae'
 XAE_USES=		xorg
 XAE_USE=		XORG=x11
 XAE_PLIST_FILES=	bin/xae bin/rxae
 XAE_ALL_TARGET=		xae
 XAE_DESKTOP_ENTRIES=	"Xae" "" "" "xae" "" false
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|cc|${CC}|g ; \
 		 s|"-s"|""|g ; \
 		 s|/usr/X11R6|${LOCALBASE}|g' \
 		 ${WRKSRC}/create.mk.aee \
 		 ${WRKSRC}/create.mk.xae
 	@${REINPLACE_CMD} -e 's|/usr/local/lib|${DATADIR}|g' \
 		${WRKSRC}/aee.1  \
 		${WRKSRC}/localize.c
+		${CHMOD} 0544 ${WRKSRC}/create.mk.aee ${WRKSRC}/create.mk.xae ${WRKSRC}/install-sh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/aee ${STAGEDIR}${PREFIX}/bin
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} aee rae)
 	${INSTALL_MAN} ${WRKSRC}/aee.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/help.ae ${STAGEDIR}${DATADIR}
 
 do-install-XAE-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/xae ${STAGEDIR}${PREFIX}/bin
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} xae rxae)
 
 .include <bsd.port.mk>
diff --git a/editors/aee/distinfo b/editors/aee/distinfo
index 0df4807608d8..b37d854f4326 100644
--- a/editors/aee/distinfo
+++ b/editors/aee/distinfo
@@ -1,3 +1,4 @@
-TIMESTAMP = 1585228463
-SHA256 (aee-2.2.21.tar.gz) = b8a9a20679736ec44e74faae1550b33411cc675f7c587d2316e578f97b0d3727
-SIZE (aee-2.2.21.tar.gz) = 186304
+TIMESTAMP = 1623486859
+SHA256 (ports1-aee-bf68f4accb96ac39020ac2d9092022aebfa5df27_GL0.tar.gz) = 399644fbe796868671c5b7e1b95a08f05fe2fc5b7dfdd54fabd156c7fad140ac
+SHA512 (ports1-aee-bf68f4accb96ac39020ac2d9092022aebfa5df27_GL0.tar.gz) = 0c631dc1d996307667cee90b124ee8dceeb33584981cd87ac7824d40a25bb6e9b94848ec122b7df09f4d975f9460cfcb8da085a684609197364b40c7cb7e633a
+SIZE (ports1-aee-bf68f4accb96ac39020ac2d9092022aebfa5df27_GL0.tar.gz) = 183804
diff --git a/editors/aee/pkg-descr b/editors/aee/pkg-descr
index 93349cdd38db..6a9fd2e97985 100644
--- a/editors/aee/pkg-descr
+++ b/editors/aee/pkg-descr
@@ -1,11 +1,11 @@
 "Another Easy Editor"
 An easy to use text editor intended to be usable with little or no
 instruction. Provides a full-screen text interface via curses (aee)
 as well as a graphical user interface under X windows (xae).
 Features include pop-up menus, cut-and-paste, journaling, and
 multiple edit buffers.
 
 aee is a superset of the "Easy Editor" (ee) which is part of the
 FreeBSD base system.
 
-WWW: https://BSDforge.com/projects/editors/aee/
+WWW:	https://gitlab.com/ports1/aee