diff --git a/dev-python/python-blivet/Manifest b/dev-python/python-blivet/Manifest
index 30816aacd..a0dcf2d92 100644
--- a/dev-python/python-blivet/Manifest
+++ b/dev-python/python-blivet/Manifest
@@ -1,2 +1 @@
-DIST blivet-0.23.9-1.tar.gz 230824 SHA256 4cf312640c7cf040e621f997cd16496b67b84f98a70cb9aee4adce4f3353abd7 SHA512 8ca5484291b1531c7af7f2122b6a05177b685f3f112d146d382fdd6e940c8e9c51c200439d7f0fe0fd9d80e5ae0bd1ae53c07d90159c1c63aa5fa6c739789b3e WHIRLPOOL ab1bf6d45f43172e15f8f149528fb02c615677b634cfde3780c2ff5f40b63e7c67d1ca844531aaeb4f33fa39404677268de1d7ecc8bf0e432ac0143138237a97
 DIST blivet-1.0.10-1.tar.gz 324830 SHA256 8d92da01a9a6499a758340fea00fcc30f797c6b8567e27966267f263b7c71b39 SHA512 500839ccce49d13a9d30d122683a3d794b04bbf0ceb7636729f5de184e96637657d7d7d22a713e7bbb1e7dcd267a08902f13c86dc9a00d3929c158e7d5867876 WHIRLPOOL 3592d33051f4de93755d303fafa0c9edd60d000bc119cb30370705c7a25149265f26f5df8c9be280d7dcf8737b092695281e17a9fec7d3149f02c4df8f4e3ac5
diff --git a/dev-python/python-blivet/metadata.xml b/dev-python/python-blivet/metadata.xml
index de483c535..4088b166b 100644
--- a/dev-python/python-blivet/metadata.xml
+++ b/dev-python/python-blivet/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+	<maintainer type="person">
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>skullbocks@sabayon.org</email>
+		<name>Francesco Ferretti</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild b/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild
deleted file mode 100644
index b6a45623e..000000000
--- a/dev-python/python-blivet/python-blivet-0.23.9-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils
-
-REAL_PN="${PN/python-}"
-
-DESCRIPTION="python module for examining and modifying storage configuration."
-HOMEPAGE="https://fedoraproject.org/wiki/Blivet"
-SRC_URI="https://github.com/Sabayon/${REAL_PN}/archive/${REAL_PN}-${PV}-1.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-util/pykickstart-1.99.22
-	>=sys-apps/util-linux-2.15.1
-	>=sys-block/parted-1.8.1
-	sys-fs/cryptsetup
-	>=dev-python/python-cryptsetup-0.1.1
-	sys-fs/btrfs-progs
-	sys-fs/dosfstools
-	>=sys-fs/e2fsprogs-1.41.0
-	sys-fs/lvm2
-	sys-fs/mdadm
-	>=dev-python/pyblock-0.45
-	sys-fs/multipath-tools
-	sys-process/lsof
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${REAL_PN}-${REAL_PN}-${PV}-1"
-
-src_prepare() {
-	# libudev in Gentoo is in /usr/lib64 if systemd
-	epatch "${FILESDIR}/${PN}-udev-path.patch"
-
-	# multipath -c hangs on x86 due to a libc bug
-	# Temporarily disable this
-	use x86 && epatch "${FILESDIR}/${PN}-workaround-disable-multipath.patch"
-
-	# Fix package names
-	epatch "${FILESDIR}/0001-Update-package-names-to-reflect-Gentoo-ones.patch"
-	# enable UUID= support for dm-based devices (dmcrypt, md, etc)
-	epatch "${FILESDIR}/0001-devices-enable-UUID-for-dm-based-devices-in-fstab.patch"
-
-	# Sabayon: commitToDisk should wait on udev. There is a missing udev_settle() call.
-	epatch "${FILESDIR}/${PN}-commit-to-disk-settle.patch"
-
-	distutils_src_prepare
-}
diff --git a/dev-python/python-blivet/python-blivet-1.0.10.ebuild b/dev-python/python-blivet/python-blivet-1.0.10.ebuild
index 01fec0cff..d9d423cee 100644
--- a/dev-python/python-blivet/python-blivet-1.0.10.ebuild
+++ b/dev-python/python-blivet/python-blivet-1.0.10.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit eutils distutils
+inherit eutils distutils-r1
 
 REAL_PN="${PN/python-}"
 
 DESCRIPTION="A python module for system storage configuration"
 HOMEPAGE="https://fedoraproject.org/wiki/Blivet"
 SRC_URI="https://github.com/rhinstaller/${REAL_PN}/archive/${REAL_PN}-${PV}-1.tar.gz"
-RESTRICT="nomirror"
+RESTRICT="mirror"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -46,5 +46,5 @@ src_prepare() {
 	epatch "${FILESDIR}/1.0/0003-Call-udev.settle-when-committing-to-disk.patch"
 	epatch "${FILESDIR}/1.0/0004-Add-support-for-parsing-etc-sabayon-release.patch"
 
-	distutils_src_prepare
+	distutils-r1_src_prepare
 }