diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 84953fd..44ba17a 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,5 +1,5 @@
-EBUILD youcompleteme-20190407.ebuild 5793 BLAKE2B eea2c7cc3576de95fdbe6d334e23e3d4c65a1a6979c9ea3c0f8e173ffee8c90062cfb6cb7db02d45a1ea517a0d6a12eac418f710cfae8e97a8f1cb2d9e3afdaa SHA512 d60bdf17c353fad03ca65767513534cb27cc99147b432962f416199ed3f9328fa27ac8396be30919967a4dd360577a2618ae7ae8d70a283a74047d23b3dca9ff
 EBUILD youcompleteme-20190418.ebuild 5793 BLAKE2B 3d2638a59b50136592c7f63c295fe5762e440baa1bd12cb38728be2701f7e8531c674e0fa5e2f2002a07bfffef6e808a80efc04986659126d0702460f8ab2551 SHA512 f4c38f24df73175c8ab4ebca72b4a33607a13fe9309509d1511dc7c4910e33f4f51f6e7a7bc2a998a94f58ba8c58501389a1c4e6e941e2d870892798dc06c480
 EBUILD youcompleteme-20190429.ebuild 6211 BLAKE2B 43311cd0417a13310421e90796caabdeb3f7fb7eb9197eb791f1fb30db411f586b7db4dd1cbee3c497bd4f7049c51fc12f2153a8b134f8bf5d4b2c5807e349e3 SHA512 18d0e9e313bc7ae074a52a6aad20fa262c0129704abe786ce013040796a8a7e9f5c1ede924b073527f97e253efdbab7606e76c3bc6cdfe24ce3683b3f8e95eea
+EBUILD youcompleteme-20190508.ebuild 6180 BLAKE2B aaa8de351502cee2c43b51f2770c584f73f1df5673aee89cd919aae47c9891f96bb68463b4c88467397fd53857d963e181e189a1a59f84273414ea0881e214e8 SHA512 028cf99255e19551f635ed63ecda60a0c74599092a6b5d48bb447076784cb48dbf0c581f8da0b9d95153a59fe7ffa10deb79c73ed2db73ce192dea93a39b7b61
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
 MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70
diff --git a/app-vim/youcompleteme/youcompleteme-20190407.ebuild b/app-vim/youcompleteme/youcompleteme-20190508.ebuild
similarity index 89%
rename from app-vim/youcompleteme/youcompleteme-20190407.ebuild
rename to app-vim/youcompleteme/youcompleteme-20190508.ebuild
index 49b4103..87a5e76 100644
--- a/app-vim/youcompleteme/youcompleteme-20190407.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20190508.ebuild
@@ -10,8 +10,17 @@ inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin
 DESCRIPTION="vim plugin: a code-completion engine for Vim"
 HOMEPAGE="https://github.com/Valloric/YouCompleteMe"
 EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe"
-EGIT_COMMIT="151fa5765a08c9038f0dc9541c8fb9bbf21d053c"
+EGIT_COMMIT="944e7f5383dcc48a6ccfa598f353e6aefe97eb5b"
 SRC_URI=""
+EGIT_SUBMODULES=(
+	'third_party/ycmd'
+	'third_party/OmniSharpServer'
+	'cecil'
+	'NRefactory'
+	'third_party/racerd'
+	'third_party/go/src/github.com/mdempsky/gocode'
+	'third_party/go/src/github.com/rogpeppe/godef'
+	)
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -39,10 +48,15 @@ COMMON_DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/frozendict[${PYTHON_USEDEP}]
+	dev-python/requests-futures[${PYTHON_USEDEP}]
 	dev-python/sh[${PYTHON_USEDEP}]
 	dev-python/waitress[${PYTHON_USEDEP}]
+	dev-python/numpydoc[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.12.1[${PYTHON_USEDEP}]
+	dev-python/parso[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="
@@ -173,7 +187,7 @@ src_install() {
 
 	cd "${S}"
 	use doc && dodoc *.md third_party/ycmd/*.md
-	rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt ci third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/ycmd/tests third_party/ycmd/examples/samples || die
+	rm -r *.md *.sh *.py* *.ini *.yml COPYING.txt third_party/ycmd/cpp third_party/ycmd/ci third_party/ycmd/examples/samples || die
 	rm -r third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*} || die
 	find python -name *test* -exec rm -rf {} + || die
 	find third_party/ycmd/third_party -name test -exec rm -rf {} + || die