diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 322e979..2dc8f6b 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,6 +1,6 @@
-EBUILD youcompleteme-20171216.ebuild 5200 BLAKE2B ca4be6ec38f19dc370e5efe2b7662a0bd476f6af053857541a22838939fb6abf247e68da2bad02744375be25358b77dd12d43ceb33eb644fd1c6bccecb0beec3 SHA512 aea9aed2f1e31d4c434c62cde1159ea1d0312c8da1f9337950fd0b1f2b5804d2d2e6e00eb913cbd26b8fafcd14b069abe5868b53d8c8803b68eede3a5ec3efbf
 EBUILD youcompleteme-20180219-r1.ebuild 6069 BLAKE2B 72ad68dba3ed3dccd5b87e1618bb8ae25f35974437d019620c810aacd23a743bd92760e7d7efee613174c4d47137d0d073f652958a46cc6cb1c8d4abecb5c38e SHA512 0c7e99dbe67a747986b3200023ee5f6d8e1981cfa9eae733b6146525804b8df1c4077e5fbe1c496d3b72ae4fa0004e2457fe0a0ba652f2222b2c9d59006c9366
 EBUILD youcompleteme-20180615.ebuild 6057 BLAKE2B 65f50bd5fa433949357eeae0f5f2fd354ee1273fe941f9d89b9608bd689199db22839e1da374037b4f13f2be794ce8dc7f3737422aa9d6b57d5da36dc46e8548 SHA512 026a0a04f5835f0d7ccca0434bacae97fc18d7576e7a34524d373970f5bc09ecdf010e255fc8ca615b985f2f3e0fe9a3d765bd116a3457e6812ecc78eb0ed26a
-EBUILD youcompleteme-99999999-r4.ebuild 6002 BLAKE2B 8c24d1f5db2be9b0d6fd5ecbe93ab1e4e00cd365b1071a78e790fcc23a0114950cbc1e59989f12c52cb75579f91a409b5d1660b67a1f3cb972e2ea61b454e50e SHA512 850f4dbaa8e5e9780c90b4c88fd6cd9e09f2dd01a7d1973af6d33127b0dd6209f34abdc8328e89b787f81f94a147974e72ad844b0f16ce1e1b51e74755eb5e59
+EBUILD youcompleteme-20180807.ebuild 5963 BLAKE2B 502d8ba2209c326b7dad336ea2d95c3033e526e656f835fe2cee5aed862d87a447810198e8477ce3e2521f3e5a42ee917e4a128c0fba8d09cd75dde40ca797e1 SHA512 28459c2b752b6d87883c74db668f2a2320280a66c682e7eac4adb24612ef16d1d4b82bd707756ddfc4913a8c9f7f7c3dafc6ab6eb2dd836755e370d33e1a8945
+EBUILD youcompleteme-99999999-r5.ebuild 5908 BLAKE2B 78ba09fccb2c8f7731cd7c4ab7be4f6dd7827d15c49cc01999382463177c18c1539662bf7c5b90bb3b8fab479c8aa710a3157fde4b7d8cadd624540729ddb280 SHA512 b60decf172a19d316391d624fcfd09af080522bc2a7912b304dfddaefb1cf7f5d8aea8bf5e4ffd90b683ac1b3c14589547c67e93e3cc7205b412a28266b409dd
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
 MISC metadata.xml 672 BLAKE2B 27d98400640fe6befc7cc4f35803af907c631d7204b24cafe2f799d528fbfda3be5e1fb2e9dbf93ebc72a66e0ac5a0a7e3c164bb29596a8bde3b1ec2579bed8a SHA512 8cff7a413256f2fed659c9757c6162970d35544ba665c023f3d555b1203d812a3b9caa4e3163a2e708192aaa986435d0f246c76569e30801116ade112a453a70
diff --git a/app-vim/youcompleteme/youcompleteme-99999999-r4.ebuild b/app-vim/youcompleteme/youcompleteme-20180807.ebuild
similarity index 97%
rename from app-vim/youcompleteme/youcompleteme-99999999-r4.ebuild
rename to app-vim/youcompleteme/youcompleteme-20180807.ebuild
index c84a2a5..04c2daa 100644
--- a/app-vim/youcompleteme/youcompleteme-99999999-r4.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20180807.ebuild
@@ -10,6 +10,7 @@ inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin
 DESCRIPTION="vim plugin: a code-completion engine for Vim"
 HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
 EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
+EGIT_COMMIT="15362d9cb8ec054c929e9a202252825eabe47e58"
 SRC_URI=""
 
 LICENSE="GPL-3"
@@ -38,7 +39,6 @@ RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/bottle[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/sh[${PYTHON_USEDEP}]
 	dev-python/waitress[${PYTHON_USEDEP}]
@@ -72,7 +72,6 @@ src_prepare() {
 	for third_party_module in bottle python-future requests waitress; do
 		rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
 	done
-	rm -r "${S}"/third_party/ycmd/third_party/JediHTTP/vendor || die "Failed to remove third_party/ycmd/third_party/JediHTTP/vendor"
 	rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost"
 
 }
@@ -180,6 +179,7 @@ src_install() {
 	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 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
 	egit_clean
 	use clang && (rm third_party/ycmd/libclang.so* || die)
 
diff --git a/app-vim/youcompleteme/youcompleteme-20171216.ebuild b/app-vim/youcompleteme/youcompleteme-99999999-r5.ebuild
similarity index 80%
rename from app-vim/youcompleteme/youcompleteme-20171216.ebuild
rename to app-vim/youcompleteme/youcompleteme-99999999-r5.ebuild
index d128a1a..0619f2c 100644
--- a/app-vim/youcompleteme/youcompleteme-20171216.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-99999999-r5.ebuild
@@ -10,13 +10,12 @@ inherit eutils cmake-utils git-r3 multilib python-single-r1 vim-plugin
 DESCRIPTION="vim plugin: a code-completion engine for Vim"
 HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
 EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
-EGIT_COMMIT="290dd94721d1bc97fab4f2e975a0cf6258abfbac"
 SRC_URI=""
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="clang doc test mono go rust nodejs"
+IUSE="clang +doc test mono go rust nodejs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
@@ -39,7 +38,6 @@ RDEPEND="
 	${COMMON_DEPEND}
 	dev-python/bottle[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/sh[${PYTHON_USEDEP}]
 	dev-python/waitress[${PYTHON_USEDEP}]
@@ -70,10 +68,9 @@ src_prepare() {
 		rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
 	done
 	# Argparse is included in python 2.7
-	for third_party_module in argparse bottle python-future requests waitress; do
+	for third_party_module in bottle python-future requests waitress; do
 		rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
 	done
-	rm -r "${S}"/third_party/ycmd/third_party/JediHTTP/vendor || die "Failed to remove third_party/ycmd/third_party/JediHTTP/vendor"
 	rm -r "${S}"/third_party/ycmd/cpp/BoostParts || die "Failed to remove bundled boost"
 
 }
@@ -179,13 +176,26 @@ 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 third_party/ycmd/{*.md,*.sh,*.yml,.coveragerc,.gitignore,.gitmodules,.travis.yml,build.*,*.txt,run_tests.*,*.ini,update*,Vagrantfile} || 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
 	egit_clean
 	use clang && (rm third_party/ycmd/libclang.so* || die)
 
 	vim-plugin_src_install
 
+	use mono || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/OmniSharpServer"
+	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/racerd"
+	use rust || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/rust"
+	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/gocode"
+	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/godef"
+	use go || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/go"
+	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/third_party/tern_runtime"
+	use nodejs || rm -rf "${D}/usr/share/vim/vimfiles/third_party/ycmd/ycmd/completers/javascript"
+	find "${D}" -name .gitignore -exec rm -rf {} + || die
+	find "${D}" -name .travis.yml -exec rm -rf {} + || die
+	find "${D}" -name README.rst -exec rm -rf {} + || die
+
 	python_optimize "${ED}"
 	python_fix_shebang "${ED}"
 }