diff --git a/app-vim/deoplete/Manifest b/app-vim/deoplete/Manifest
index bacc4db..a068f1a 100644
--- a/app-vim/deoplete/Manifest
+++ b/app-vim/deoplete/Manifest
@@ -1,3 +1,3 @@
 DIST deoplete-4.0.tar.gz 41296 BLAKE2B 69bd9118e460e2b56c07880ccd9a5ce366312100d840a6ba83438b25b48308f04f7b659e54085d35950508ed46973d1869688518b87fd8242c14f65c28ed67a8 SHA512 04a729db469a72cdacd30b54d10af1e076537919eadfdb6c2a61797f9ddf0f4bdcff707a9f7bb78f3a8d4026239854b00f14ebfc8724d40dcff3220463d8872f
-EBUILD deoplete-4.0.ebuild 1017 BLAKE2B 5a22a4021bac9e4bb3711fc0a281f7692abf370dff653f35fd0c5b3101dfd80472e36ede707bff1d0246371dfc8bea5e6fb5aa80490dfcb2e53cafd650cc8454 SHA512 65a321fdbc761b0fddbac8210093f46437960838c278431f6a8712fd39ff7c0aa0557e85f4c97873329a4e3a86af80ad769a5fe3e958d0e2475a31157b41fc7a
-MISC metadata.xml 222 BLAKE2B f0ecd2d956de9c731b8a6b6860f8756cb8dba0591f73463ce32d2747a1aa21296886faea89feee2b208286bbcdfe8e2e0a64263a92e954615fa94e2852d933d5 SHA512 dad470f0096a4fb3af9eeb60dab3216ece032790f6c49a3b014799ee0c02dee96a67317a672344e32f5614c5e05419727cc99113c6ecc37ae594931dd6441eef
+EBUILD deoplete-4.0.ebuild 1144 BLAKE2B 0fae6f5f768f980f9f88d641fedf8cc350eb0cda94cd0481e9d7a094cdcc8061516705e8ce836531eaa59e20851139c842a0987fe90310ad651249a046ae3c9c SHA512 cf091d1fd87692a478ad10a6d9b2c0735c5a4a9ee6127073914bcae4c04c3d2905f85114a7717f4ecc45b00950835338167cdb490af6fecb0b145ec8758a58de
+MISC metadata.xml 408 BLAKE2B 1f5ec5fcd2a0eb563c06d7dce2c83a6857894ae78b7e51085c580020a389da4bfaac5bea151ab95ef4eb058ac935ac94eecb10a29efbe99bb19621be465e4bf3 SHA512 0e19e70d08fd2c1d088a9c4c7a8398ff88b05fbd3ed82ad0c82d63d84b646bead8a0f06df3aa82ecd2cf3984c840729ad1a539795bcf97c675895df802e47c4d
diff --git a/app-vim/deoplete/deoplete-4.0.ebuild b/app-vim/deoplete/deoplete-4.0.ebuild
index e6a2380..e8bb2ae 100644
--- a/app-vim/deoplete/deoplete-4.0.ebuild
+++ b/app-vim/deoplete/deoplete-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,24 @@ SRC_URI="https://github.com/Shougo/deoplete.nvim/archive/${PV}-serial.tar.gz ->
 KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
-IUSE="+doc"
+IUSE="+doc +vim +nvim"
+REQUIRED_USE="
+	|| (
+	vim
+	nvim
+	)
+"
 
 DEPEND=""
-RDEPEND="app-editors/neovim[python]"
+RDEPEND="
+	vim? (
+	app-editors/vim[python]
+	app-vim/vim-hug-neovim-rpc
+	)
+	nvim? (
+	app-editors/neovim[python]
+	)
+"
 
 src_compile() {
 	true
diff --git a/app-vim/deoplete/metadata.xml b/app-vim/deoplete/metadata.xml
index 5993c93..7089557 100644
--- a/app-vim/deoplete/metadata.xml
+++ b/app-vim/deoplete/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="person">
 		<email>trenttdually@gmail.com</email>
 	</maintainer>
+	<use>
+		<flag name="nvim">Enable support for neovim using <pkg>app-editors/neovim</pkg></flag>
+		<flag name="vim">Enable support for vim using <pkg>app-editors/vim</pkg></flag>
+	</use>
 </pkgmetadata>