diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
new file mode 100644
index 0000000..85cb2bc
--- /dev/null
+++ b/app-admin/doas/Manifest
@@ -0,0 +1 @@
+DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
new file mode 100644
index 0000000..5c9386b
--- /dev/null
+++ b/app-admin/doas/doas-6.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A portable fork of the OpenBSD doas command"
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Duncaen/${MY_PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="ISC"
+SLOT="0"
+IUSE="pam"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/yacc
+"
+
+if [[ ! "${PV}" == *9999* ]]; then
+	S="${WORKDIR}"/${MY_P}
+fi
+
+DOCS=(
+	README.md
+)
+
+src_prepare() {
+	default
+	sed -i 's/-Werror //' Makefile || die
+}
+
+src_configure() {
+	tc-export CC AR
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_with pam)
+	)
+	./configure "${myconf[@]}"
+}
diff --git a/app-admin/doas/doas-9999.ebuild b/app-admin/doas/doas-9999.ebuild
new file mode 100644
index 0000000..5c9386b
--- /dev/null
+++ b/app-admin/doas/doas-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A portable fork of the OpenBSD doas command"
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Duncaen/${MY_PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="mirror"
+LICENSE="ISC"
+SLOT="0"
+IUSE="pam"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/yacc
+"
+
+if [[ ! "${PV}" == *9999* ]]; then
+	S="${WORKDIR}"/${MY_P}
+fi
+
+DOCS=(
+	README.md
+)
+
+src_prepare() {
+	default
+	sed -i 's/-Werror //' Makefile || die
+}
+
+src_configure() {
+	tc-export CC AR
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_with pam)
+	)
+	./configure "${myconf[@]}"
+}
diff --git a/app-admin/doas/metadata.xml b/app-admin/doas/metadata.xml
new file mode 100644
index 0000000..c1c8899
--- /dev/null
+++ b/app-admin/doas/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">Duncaen/OpenDoas</remote-id>
+  </upstream>
+</pkgmetadata>