diff --git a/app-crypt/clevis/Manifest b/app-crypt/clevis/Manifest
index b92afd3..5f22a39 100644
--- a/app-crypt/clevis/Manifest
+++ b/app-crypt/clevis/Manifest
@@ -1,5 +1,3 @@
-AUX clevis-10-dont-check-dracut.patch 420 BLAKE2B 98bbf8bf85b57041b4f0ac240f26ceea41f50960bc129140d36117bcb4a1908cd8060d4adcdb6a7148826e0ec993cd003313fa9c772052cfa668df8546a574d9 SHA512 967d2cb3cf4c9d9afd0a80611382d07acf6fd8037e83766b88935f120d780c8641c406f804c0fffe571c4a79b96242dc2ba10de1de0efd1277e076dbda3d3d4e
-DIST clevis-10.tar.bz2 137411 BLAKE2B 73118d7f924366a752251f37b5d9b17707e77d10582a6dc636bcac20a372c4920e190c137f0c8f24036bb2074bd877e312d18f8ea95509546479ef0cca202afc SHA512 4fb95790eef84be414a0b5bcc992097ed4eb36c89bb3ff76e09ea45d7106b980f6b5f79566488c58ca9558f533235e5f95580e2c40d9f1a291d0def89481352f
 DIST clevis-11.tar.xz 37216 BLAKE2B d6525237c4978862769d00120608ee1b5fb06e7a754b782421941ec236f32f87f4426820cdb656a08bc761f8466563b1c740fa50faaa21d03442afaf032146d4 SHA512 f15033a27f662986c48ca36390d3b0f127bc691b3cd7a35d437db2e2b123f8bbebd6385d799620b11f42db0d279a2030d5bf69e55e96a584800393bf47a00368
-EBUILD clevis-10.ebuild 997 BLAKE2B b29d4a2843cdf75848be7239b5464079f435b2c0fb9e733d24852ddccfee323bccdc0c3387e93b964840b7137f8924fd5ae3d87b14f8c4ea3670717b37adf497 SHA512 e84ef4ca720c94a716b642a984f03165e3422b4c00cfc7c0932bdf7ad3708371347ecd0f0923b10aabb12fb7e1a72d5281ddc5689b697f4f8433f71be48170dd
-EBUILD clevis-11.ebuild 741 BLAKE2B 411fb9ffceee17aa48442126d0cf4e6594c6f6acfd0f56ce9af432fd0a45dd50049dcdcb6fa9b2089889ab86090c9abecab6fd55a9b456182ae55012e75d0fc2 SHA512 7fd46a687c943b017e122a8307afa01b80e93ebeda99a5596cf69b03931217961dc1392638e5698f72ac824ff8ee90ad39b15533b3f24ea8a1cf39d089b96eb9
+EBUILD clevis-11.ebuild 736 BLAKE2B e47570f2dac676442e0a60a0ed4f10ba167cf990b1493f06b2831b80242bf2a39051edea510be866179db86160a8a5f5ba5b52c937a4ad7a40cd4dfa22a7e7bf SHA512 c1b1975d9016b0393eba5a42c10fbd020a8d51fd19f29f35eaf53deef506fae2c474b70d9036e22face9e2b20437584fd4a178e6c53846843167040d26a83eb9
+MISC metadata.xml 336 BLAKE2B 2ce902afb3b2ee7c0f84a60cd5c17d8f83a688a01201c6a5e181ab89173dce3bbf8dd6d7ab1e7ac87a21fda7a26be847580d0813cc03aed080f152316cccd5c0 SHA512 5f722847b8b831841d13ef3e8175cfd324115927a2c2d06e267ee473fdfbf1132cd96af8274a28d282ab07c13ce95fda14d8e0ab5e0a15e98f20c0ed1e1e17ff
diff --git a/app-crypt/clevis/clevis-10.ebuild b/app-crypt/clevis/clevis-10.ebuild
deleted file mode 100644
index 4823129..0000000
--- a/app-crypt/clevis/clevis-10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Clevis is a plugable framework for automated decryption"
-HOMEPAGE="https://latchset.github.io/"
-SRC_URI="https://github.com/latchset/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dracut"
-
-DEPEND=">=sys-fs/luksmeta-8
-	dev-libs/openssl:0=
-	>=dev-libs/jansson-2.10
-	>=dev-libs/jose-8
-	dev-libs/libpwquality
-	sys-fs/udisks:2
-	sys-apps/systemd
-	dracut? ( sys-kernel/dracut )
-	>=sys-process/audit-2.7.8"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-dont-check-dracut.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dracutmodulesdir="${PREFIX}/usr/lib/dracut/modules.d"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use dracut; then
-		rm -rf ${D}/usr/lib/dracut
-	fi
-}
diff --git a/app-crypt/clevis/clevis-11.ebuild b/app-crypt/clevis/clevis-11.ebuild
index 1c33829..09e9698 100644
--- a/app-crypt/clevis/clevis-11.ebuild
+++ b/app-crypt/clevis/clevis-11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit meson systemd
 
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion dracut udisks"
 
-DEPEND="app-text/asciidoc
+DEPEND="
+	app-text/asciidoc
 	>=sys-fs/luksmeta-8
 	dev-libs/openssl:0=
 	>=dev-libs/jansson-2.10
@@ -24,5 +25,6 @@ DEPEND="app-text/asciidoc
 	dracut?	( sys-kernel/dracut )
 	udisks? ( sys-fs/udisks:2
 	>=sys-process/audit-2.7.8 )
-	bash-completion? ( app-shells/bash-completion )"
+	bash-completion? ( app-shells/bash-completion )
+"
 RDEPEND="${DEPEND}"
diff --git a/app-crypt/clevis/files/clevis-10-dont-check-dracut.patch b/app-crypt/clevis/files/clevis-10-dont-check-dracut.patch
deleted file mode 100644
index 70fefec..0000000
--- a/app-crypt/clevis/files/clevis-10-dont-check-dracut.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -dNur a/configure.ac b/configure.ac
---- a/configure.ac	2018-03-21 19:16:33.000000000 +0100
-+++ b/configure.ac	2018-07-26 11:00:36.263883657 +0200
-@@ -17,7 +17,6 @@
- PKG_CHECK_MODULES([udisks2], [udisks2])
- PKG_CHECK_MODULES([jose], [jose >= 8])
- PKG_CHECK_MODULES([systemd], [systemd])
--PKG_CHECK_MODULES([dracut], [dracut])
- PKG_CHECK_MODULES([audit], [audit >= 2.7.8])
- 
- AC_CHECK_PROG([PWMAKE], [pwmake], [yes])
diff --git a/app-crypt/clevis/metadata.xml b/app-crypt/clevis/metadata.xml
new file mode 100644
index 0000000..aa41ab6
--- /dev/null
+++ b/app-crypt/clevis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/clevis</remote-id>
+	</upstream>
+</pkgmetadata>