diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index e382660..4e5acac 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,5 +1,5 @@
-EBUILD youcompleteme-20200320.ebuild 4701 BLAKE2B 976e2e5cefaf888c98c3f47839df93ff6c9442c0a45974e343ed8920fb8c718fda0b10e3264a0bb8e086c9b31e824e99cc59d0cbad56d77656a9e3a925b8caf2 SHA512 fc394aa5776989f1a5880b80b562452f7bbd0fdb3f11894d4e2d35817b5ab5a5e59999eb8e05738ce9a3da35a72d4e092036e1aa2e66dabea39dda5b96be9bd8
 EBUILD youcompleteme-20200412.ebuild 4701 BLAKE2B badbd0f3af967609644f295caf730749083d1869a8fe66eb68487a84b354b6d1df95789827d223a14155c1ab7b765432e73f58f97901bbebcc2801527b17e2f9 SHA512 138ffd79a7d18c90a644ab7fcd13fc04be61cefdf73c2837545ec8a93a431ce0a38d3b888661ff256dd4cc6c9f1ee5f546e08561e3927141f9368ca958cbb696
 EBUILD youcompleteme-20200415.ebuild 4768 BLAKE2B f31f1ceaea3c87648899847654cc1781caa0cf00043e1ea849e89fea3cd68d990219f74aed9cc9b028921a841a4c2725c3de2441495d53c5b570d763f5f57e60 SHA512 2a7a9d0b0d3b10de976ebde50b8e9487fa8f695a7c13c9ad1a1f538566cfe599a5d94a3b251339b372abe34c7ee2b396e225b36489ae8444b189d8aaa374635e
+EBUILD youcompleteme-20200420.ebuild 4430 BLAKE2B ac35190110eef93264debdbfd10957f7f4c9c0025d927457bf8d6d09ca9c128880491fcc71a11932ce4d10e6154e62718d9450244d8defc8dd68b1141668d9c0 SHA512 bff0625e2f2cd97041c1722f6384e078d1dc6b11551035247346ad4c27949fed1e20684fe1a2c59c443a3dc32d88a7d7abe49018b62ce6925c1edba728927ed1
 MISC README.md 1017 BLAKE2B b3ceff351a191e710ae7b9d55602a1a6d1858c403b61d5bcde8c1aac2203093ee15994ced762e9fc996e4b88e65f8f73fd0fd1e27dc5b7fe032291a75b3a53fe SHA512 fb8d02d90df215addc2b13e60975a3d1e41d3cca945294ca1a3013ab337b7dcd834151aabb7712036fb13189a53e69b14a531110cc3820431416cd620404d08f
 MISC metadata.xml 684 BLAKE2B ad2a46ec4665b4530aeca2821030dec6a7eccb020b65f61a79b58b2bff959f4964e44d81c3e2914ed344758bc1b80e18bd166ae638339d67b5360b9473804f0d SHA512 b9d20edf383cd83dfefaa2d46811c876de7b02985d5d8c86645d0e787f243710100d85adaf24311ef0c9020aace0a41083f4443134009f2b6533d8e2ba2887b9
diff --git a/app-vim/youcompleteme/youcompleteme-20200320.ebuild b/app-vim/youcompleteme/youcompleteme-20200420.ebuild
similarity index 88%
rename from app-vim/youcompleteme/youcompleteme-20200320.ebuild
rename to app-vim/youcompleteme/youcompleteme-20200420.ebuild
index 2c3c1b0..ba5ccbc 100644
--- a/app-vim/youcompleteme/youcompleteme-20200320.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20200420.ebuild
@@ -10,11 +10,10 @@ 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="cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3"
+EGIT_COMMIT="367c1518cd6f2c8695000924b8ec2815a30a9af3"
 SRC_URI=""
 EGIT_SUBMODULES=(
 	'third_party/ycmd'
-	'third_party/ycmd/third_party/go/src/golang.org/x/tools'
 	)
 
 LICENSE="GPL-3"
@@ -26,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-7.0:= )
-	go?   ( dev-lang/go )
+	go?   ( dev-go/gopls )
 	tern? ( net-libs/nodejs )
 	typescript? ( net-libs/nodejs )
 	neovim? (
@@ -50,6 +49,9 @@ RDEPEND="
 	dev-python/numpydoc
 	>=dev-python/jedi-0.12.1
 	dev-python/parso
+	dev-python/watchdog
+	dev-python/pathtools
+	dev-python/flask-sphinx-themes
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -91,13 +93,6 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 
-	if use go;
-	then
-		# export GOPATH="$GOPATH:${S}/third_party/ycmd/third_party/go"
-		cd "${S}/third_party/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls" || die "failed cd to gopls"
-		go build || die "failed to go build gocode GOPATH is $GOPATH"
-	fi
-
 	if use tern;
 	then
 		cd "${S}/third_party/ycmd/third_party/tern_runtime" || die "no dir third_party/tern_runtime"
@@ -129,11 +124,8 @@ src_install() {
 
 	if use go;
 	then
-		cd "${S}/third_party/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls"
-		for f in $(ls -a | tail -n +3 | grep -v '^gopls$')
-		do
-			rm -rf "${f}"
-		done
+		mkdir -p "${S}/third_party/ycmd/third_party/go/bin"
+		ln -s /usr/bin/gopls  "${S}/third_party/ycmd/third_party/go/bin/gopls"
 	fi
 
 	cd "${S}"