diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild
index 3c54b5d906435..8133d6c414668 100644
--- a/dev-python/twill/twill-0.9-r1.ebuild
+++ b/dev-python/twill/twill-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,20 +20,24 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc examples"
 
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7)
-		|| (
-			dev-python/dnspython:0[${PYTHON_USEDEP}]
-			virtual/python-dnspython:0[${PYTHON_USEDEP}]
-		)
+		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'virtual/python-dnspython[${PYTHON_USEDEP}]' 'python2*')
 	)"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_compile_all() {
 	if use doc; then
+		python_setup 'python2*'
 		pushd doc > /dev/null || die
 		chmod +x make-epydoc.sh || die
 		./make-epydoc.sh || die