diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
new file mode 100644
index 0000000..09d4d97
--- /dev/null
+++ b/net-mail/automx2/Manifest
@@ -0,0 +1 @@
+DIST automx2-2022.1.tar.gz 182519 BLAKE2B baf2ecc801f6f024eb6a6fe2610d6cb7c3dd0726cfa877fdea76d94ebf16b9393addc5be8844f3017fd664b73adc74f2cd898736bbcad1fa0b2b3c1022cb638a SHA512 3d6fb9cf01cff641c78851560d72e3d80f9011cca4cd438cd49e999feef3f290bbd9495655f41319eb5456beac09bb8862dc327b521254266e0d53aa17b0bbd3
diff --git a/net-mail/automx2/automx2-2022.1.ebuild b/net-mail/automx2/automx2-2022.1.ebuild
new file mode 100644
index 0000000..9d243e7
--- /dev/null
+++ b/net-mail/automx2/automx2-2022.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="acct-user/automx2
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -i -e "/('scripts'/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x AUTOMX2_CONF="tests/unittest.conf"
+	eunittest tests/
+}
+
+python_install_all() {
+	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
+	newconfd "${FILESDIR}/confd" "${PN}"
+	newinitd "${FILESDIR}/init-r1" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/files/conf b/net-mail/automx2/files/conf
new file mode 100644
index 0000000..ca19e0e
--- /dev/null
+++ b/net-mail/automx2/files/conf
@@ -0,0 +1,20 @@
+[automx2]
+# A typical production setup would use loglevel = WARNING
+loglevel = WARNING
+# Echo SQL commands into log? Used for debugging.
+db_echo = no
+
+# In-memory SQLite database
+#db_uri = sqlite:///:memory:
+
+# SQLite database in a UNIX-like file system
+db_uri = sqlite:////var/lib/automx2/db.sqlite
+
+# MySQL database on a remote server. This example does not use an encrypted
+# connection and is therefore *not* recommended for production use.
+#db_uri = mysql://username:password@server.example.com/db
+
+# Number of proxy servers between automx2 and the client (default: 0).
+# If your logs only show 127.0.0.1 or ::1 as the source IP for incoming
+# connections, proxy_count probably needs to be changed.
+#proxy_count = 1
diff --git a/net-mail/automx2/files/confd b/net-mail/automx2/files/confd
new file mode 100644
index 0000000..5a58d94
--- /dev/null
+++ b/net-mail/automx2/files/confd
@@ -0,0 +1,8 @@
+# Additional parameters passed to Flask
+#AUTOMX2_ARGS="--host 127.0.0.1 --port 4243"
+
+# Configuration file
+#AUTOMX2_CONF="/etc/automx2.conf"
+
+# Process owner (choose a non-privileged user)
+#AUTOMX2_USER="automx2"
diff --git a/net-mail/automx2/files/init-r1 b/net-mail/automx2/files/init-r1
new file mode 100644
index 0000000..56878e8
--- /dev/null
+++ b/net-mail/automx2/files/init-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"}
+: ${AUTOMX2_USER:="automx2"}
+: ${AUTOMX2_ARGS:="--port 4243"}
+
+command="/usr/bin/python"
+command_args="/usr/bin/flask run ${AUTOMX2_ARGS}"
+command_background="true"
+command_user="${AUTOMX2_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${AUTOMX2_CONF}"
+
+depend() {
+	use logger net
+	before nginx
+}
+
+start_pre() {
+	export AUTOMX2_CONF
+	export EPYTHON="python"
+	export FLASK_APP="automx2.server:app"
+	export FLASK_ENV="production"
+}
diff --git a/net-mail/automx2/metadata.xml b/net-mail/automx2/metadata.xml
new file mode 100644
index 0000000..54630a5
--- /dev/null
+++ b/net-mail/automx2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<longdescription>
+		automx2 makes configuring a mail account easy. It unites
+		methods for automated mailbox configuration from Apple
+		(mobileconfig), Microsoft (autodiscover) and Mozilla
+		(autoconfig) in one tool.
+	</longdescription>
+	<upstream>
+		<doc>https://github.com/rseichter/automx2/blob/master/doc/automx2.pdf</doc>
+		<maintainer>
+			<email>automx2@seichter.de</email>
+			<name>Ralph Seichter</name>
+		</maintainer>
+		<remote-id type="github">rseichter/automx2</remote-id>
+	</upstream>
+</pkgmetadata>