diff --git a/dev-python/waitress/waitress-0.8.10-r1.ebuild b/dev-python/waitress/waitress-0.8.10-r2.ebuild
similarity index 71%
rename from dev-python/waitress/waitress-0.8.10-r1.ebuild
rename to dev-python/waitress/waitress-0.8.10-r2.ebuild
index 210bf23535d49..b7bc420b9ddf3 100644
--- a/dev-python/waitress/waitress-0.8.10-r1.ebuild
+++ b/dev-python/waitress/waitress-0.8.10-r2.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$
 
@@ -15,31 +15,22 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc test"
+IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/pylons-sphinx-themes[${PYTHON_USEDEP}] )
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 src_prepare() {
-	if use doc; then
-		sed -i -e "s/^version = .*/version = \'${PV}\'/" docs/conf.py || die
-	fi
 	distutils-r1_src_prepare
 }
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
 python_test() {
 	nosetests || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }