diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index 1222531d276bf..359099b28654e 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
@@ -16,7 +16,10 @@ LICENSE="MIT"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
 
 python_test() {
 	# The tests need an interactive terminal
diff --git a/dev-python/blessings/metadata.xml b/dev-python/blessings/metadata.xml
index 84fecf6763281..b873a1b476eda 100644
--- a/dev-python/blessings/metadata.xml
+++ b/dev-python/blessings/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">blessings</remote-id>
     <remote-id type="github">erikrose/blessings</remote-id>
+    <bugs-to>https://github.com/erikrose/blessings/issues</bugs-to>
   </upstream>
 </pkgmetadata>