diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
new file mode 100644
index 0000000..ea3037c
--- /dev/null
+++ b/net-misc/oidentd/Manifest
@@ -0,0 +1 @@
+DIST oidentd-3.1.0.tar.xz 183596 BLAKE2B ed648b525153437659b9437612eb8023465d6e45a401ba64bda86e82948c588a2da4da877b371a6bb2b6f0e6f29f1a5ec844009bb2bfcf4eb0d830254da03bcd SHA512 03ce6c64a4351cecdc9177e5a035860d433689de4c86d344eab5af9810b03caedface983c4c4fb2e7ae31b7d868bfcbdd15a094a3f79f43c400258c4902a5972
diff --git a/net-misc/oidentd/files/oidentd-2.0.7-init b/net-misc/oidentd/files/oidentd-2.0.7-init
new file mode 100644
index 0000000..5b1ae44
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.7-init
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+}
+
+check_config() {
+	if [ -z "${USER}" ]
+	then
+		eerror "Please set \$USER in /etc/conf.d/oidentd!"
+		return 1
+	fi
+	if [ -z "${GROUP}" ]
+	then
+		eerror "Please set \$GROUP in /etc/conf.d/oidentd!"
+		return 1
+	fi
+
+	if [ "$(sysctl -n security.bsd.see_other_uids 2>/dev/null)" = "0" ]; then
+		eerror "${SVCNAME} cannot work if the sysctl security.bsd.see_other_uids is 0"
+		return 1
+	fi
+}
+
+
+start() {
+	check_config || return 1
+	ebegin "Starting oidentd"
+	OPTIONS="${OPTIONS} -u ${USER} -g ${GROUP}"
+	start-stop-daemon --start --quiet --exec /usr/sbin/oidentd -- $OPTIONS
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping oidentd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/oidentd
+	eend $?
+}
diff --git a/net-misc/oidentd/files/oidentd-2.2.2-confd b/net-misc/oidentd/files/oidentd-2.2.2-confd
new file mode 100644
index 0000000..215b62d
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.2.2-confd
@@ -0,0 +1,4 @@
+# oidentd start-up options
+USER="oidentd"
+GROUP="oidentd"
+OPTIONS=""
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
new file mode 100644
index 0000000..aaf442d
--- /dev/null
+++ b/net-misc/oidentd/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>Dessa@gmake.de</email>
+		<name>Robert Förster</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">janikrabe/oidentd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/oidentd/oidentd-3.1.0.ebuild b/net-misc/oidentd/oidentd-3.1.0.ebuild
new file mode 100644
index 0000000..614fff0
--- /dev/null
+++ b/net-misc/oidentd/oidentd-3.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="https://oidentd.janikrabe.com/"
+SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug ipv6 masquerade selinux"
+
+DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
+
+RDEPEND="
+	${DEPEND}
+	acct-user/oidentd
+	acct-group/oidentd
+	selinux? ( sec-policy/selinux-oident )
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_enable masquerade libnfct)
+		$(use_enable masquerade nat)
+		--enable-xdgbdir
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
+
+	systemd_dounit contrib/systemd/${PN}@.service
+	systemd_dounit contrib/systemd/${PN}.socket
+	systemd_dounit contrib/systemd/${PN}.service
+}