diff --git a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch
similarity index 50%
rename from app-editors/neovim/files/neovim-9999-cmake-release-type.patch
rename to app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch
index 8c24b6b6123fb..8114e2a92b745 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
+++ b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch
@@ -1,16 +1,16 @@
 Ensure that :checkhealth is happy with the Gentoo build type.
 https://bugs.gentoo.org/757744
---- a/runtime/lua/nvim/health.lua
-+++ b/runtime/lua/nvim/health.lua
-@@ -149,7 +149,7 @@ local function check_performance()
-     let s:buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
-     if empty(s:buildtype)
-       call health#report_error('failed to get build type from :version')
--    elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
-+    elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)'
-       call health#report_ok(s:buildtype)
-     else
-       call health#report_info(s:buildtype)
+--- a/runtime/autoload/health/nvim.vim
++++ b/runtime/autoload/health/nvim.vim
+@@ -135,7 +135,7 @@ function! s:check_performance() abort
+   let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
+   if empty(buildtype)
+     call health#report_error('failed to get build type from :version')
+-  elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
++  elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)'
+     call health#report_ok(buildtype)
+   else
+     call health#report_info(buildtype)
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -137,12 +137,6 @@ else()
diff --git a/app-editors/neovim/neovim-0.8.0-r1.ebuild b/app-editors/neovim/neovim-0.8.0-r1.ebuild
index fe675b291f831..60b97a82d3140 100644
--- a/app-editors/neovim/neovim-0.8.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.8.0-r1.ebuild
@@ -73,13 +73,12 @@ PATCHES=()
 if [[ ${PV} == 9999 ]]; then
 	PATCHES+=(
 		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
 		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 else
 	PATCHES+=(
 		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
+		"${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
 		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 fi