diff --git a/nltk-3.0.4.ebuild b/nltk-3.2.1.ebuild
index 8c4ece6..c90ba8e 100644
--- a/nltk-3.0.4.ebuild
+++ b/nltk-3.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_4} )
 PYTHON_REQ_USE="tk?,xml(+)"
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="numpy tk"
 
-RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"