diff --git a/app-dicts/hunspell-kk/Manifest b/app-dicts/hunspell-kk/Manifest
deleted file mode 100644
index 75d84028a200d..0000000000000
--- a/app-dicts/hunspell-kk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hunspell-kk-1.1.2.tar.gz 310304 SHA256 a51dfd059eb660d34cf421fb6c46811d3d2609cda94d5d1bf1e30dc02d4177f0 SHA512 ed04d2d0e341b138c7a1646807d18df1044329ade16f18165dc1e70359988302314949102d6bee7a3038e1f12974966598606f0c9dfb28cdeb025460601fa91a WHIRLPOOL 06507c4abf9e2bfa89d0c118c1efbd1185ad1f9c5aff2fa2dead582289d85bbdfd5563d858dad3ad1bf88a22a9fe5496a9a2d50f0a40930b3bfb8e83cd976111
diff --git a/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild b/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild
deleted file mode 100644
index 94eae30ea95d2..0000000000000
--- a/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit vcs-snapshot
-
-MY_P=${PN}-${PV}
-
-DESCRIPTION="Kazakh dictionaries for myspell/hunspell"
-SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/hunspell
-	app-dicts/myspell-en
-	app-dicts/myspell-ru"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodir "/usr/share/myspell"
-	insinto "/usr/share/myspell"
-	doins "${S}/kk_KZ.aff"
-	doins "${S}/kk_noun_adj.aff"
-	doins "${S}/kk_test.aff"
-	doins "${S}/kk_noun_adj.dic"
-	doins "${S}/kk_test.dic"
-	doins "${S}/kk_KZ.dic"
-	dodoc README_kk_KZ.txt
-}
diff --git a/app-dicts/myspell-kk/Manifest b/app-dicts/myspell-kk/Manifest
new file mode 100644
index 0000000000000..0ccf5f4fcc8d1
--- /dev/null
+++ b/app-dicts/myspell-kk/Manifest
@@ -0,0 +1 @@
+DIST myspell-kk-1.1.2.tar.gz 310307 SHA256 9af4e684c59f0d6020b615bacaa06a99332e32a697d88eb4da996a6ea6e88e83 SHA512 1373f7af6767a9d81b3fd03207775999eb4be7757ccbe26a849f9b3c47d7dbf0b4e8cfd3e4e6436b45478ab01dc23f7d255c2a9f7100193c6b9b3b0f7935d751 WHIRLPOOL 11012493fb0f0f1dece8e3050a8733a43cd94ddc497cc7dc3c989e09134f9732d56f622858c714d0e35c21a20dfa8c0d50babe29f743711a06b5e2cc270c65dc
diff --git a/app-dicts/hunspell-kk/metadata.xml b/app-dicts/myspell-kk/metadata.xml
similarity index 68%
rename from app-dicts/hunspell-kk/metadata.xml
rename to app-dicts/myspell-kk/metadata.xml
index b58b211fed9cd..ca127dfa14382 100644
--- a/app-dicts/hunspell-kk/metadata.xml
+++ b/app-dicts/myspell-kk/metadata.xml
@@ -4,14 +4,13 @@
 	<maintainer type="person">
 		<email>kegalym2@mail.ru</email>
 		<name>Galym Kerimbekov</name>
-		<description>Proxy maintainer, assign bugs to him</description>
+		<description>Proxied maintainer, assign bugs to him</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">kergalym/hunspell-kk</remote-id>
-		<remote-id type="sourceforge">hunspell</remote-id>
+		<remote-id type="github">kergalym/myspell-kk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
new file mode 100644
index 0000000000000..ec47882784374
--- /dev/null
+++ b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MYSPELL_DICT=(
+	"kk_KZ.aff"
+	"kk_KZ.dic"
+	"kk_noun_adj.aff"
+	"kk_noun_adj.dic"
+	"kk_test.aff"
+	"kk_test.dic"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="Kazakh dictionaries for myspell/hunspell"
+HOMEPAGE="https://github.com/kergalym/myspell-kk"
+SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}" # override eclass assignment
+RDEPEND="!app-dicts/hunspell-kk"