diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
index 11e79c3f72002..b3728b7ad58ef 100644
--- a/app-editors/aee/Manifest
+++ b/app-editors/aee/Manifest
@@ -1 +1,2 @@
 DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a
+DIST aee-2.2.22.tar.bz2 142490 BLAKE2B 2a707ebb89b98bc46e9b67d5f91404211f26ca968356f9a5f639a886099bfeed2cdd23527abb5d4ab01de0b73c5a0dacbe4abade6a456634237b54541f3dbaae SHA512 3b13105997e00d7e1e6f8a7bbfecaa7869fcb825532bddd7299ea011ecd5af64c9390fcdea4358a12443e8d6cf7acb4facdd7e6a55b645f0af55401bda619159
diff --git a/app-editors/aee/aee-2.2.22.ebuild b/app-editors/aee/aee-2.2.22.ebuild
new file mode 100644
index 0000000000000..de61735027b5d
--- /dev/null
+++ b/app-editors/aee/aee-2.2.22.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix toolchain-funcs
+
+DESCRIPTION="An easy to use text editor"
+HOMEPAGE="https://gitlab.com/ports1/aee"
+SRC_URI="https://gitlab.com/ports1/aee/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux"
+IUSE="X"
+
+RDEPEND="X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-ae-location.patch
+	"${FILESDIR}"/${PN}-gcc-10.patch
+)
+DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
+
+src_prepare() {
+	sed -i \
+		-e "s/make -/\$(MAKE) -/g" \
+		-e "/^buildaee/s/$/ localaee/" \
+		-e "/^buildxae/s/$/ localxae/" \
+		Makefile || die
+
+	sed -i \
+		-e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
+		-e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
+		-e "/other_cflag/s/ \${strip_option}//" \
+		-e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
+		create.mk.{aee,xae} || die
+
+	hprefixify create.mk.{aee,xae}
+
+	# https://gitlab.com/ports1/aee/-/merge_requests/1
+	chmod +x create.mk.{aee,xae} || die
+
+	default
+}
+
+src_compile() {
+	local target="aee"
+	use X && target="both"
+
+	emake CC="$(tc-getCC)" ${target}
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/rae
+	doman ${PN}.1
+	einstalldocs
+
+	insinto /usr/share/${PN}
+	doins help.ae
+
+	if use X; then
+		dobin xae
+		dosym xae /usr/bin/rxae
+	fi
+}
diff --git a/app-editors/aee/metadata.xml b/app-editors/aee/metadata.xml
index 9a97f3478d319..a0865a082c9ab 100644
--- a/app-editors/aee/metadata.xml
+++ b/app-editors/aee/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">ports1/aee</remote-id>
+	</upstream>
 </pkgmetadata>