diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
index 12ef627d0db90..76028da788a3a 100644
--- a/dev-libs/capstone/capstone-9999.ebuild
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -37,8 +37,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	# Currently "-Werror" is only added in the `next`-development branch, but
-	# not merged into 5.* releases. Eventually this patch may be needed in
-	# version 5 releas line. See bug #911481.
+	# not merged into 5.* releases. Eventually this patch may be needed in the
+	# version 5 release line. See bug #911481.
 	"${FILESDIR}/${P}-werror.patch"
 )
 
diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch
index 1ec58fa056a39..d5f09ca7d6568 100644
--- a/dev-libs/capstone/files/capstone-9999-werror.patch
+++ b/dev-libs/capstone/files/capstone-9999-werror.patch
@@ -2,12 +2,12 @@ Bug: https://bugs.gentoo.org/911481
 Upstream: https://github.com/capstone-engine/capstone/pull/2114
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,7 +28,7 @@ project(capstone
- if (MSVC)
-     add_compile_options(/W1 /w14189)
- else()
--    add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
-+    add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
- endif()
+@@ -25,7 +25,7 @@ project(capstone
+     VERSION 5.0
+ )
  
+-set(UNIX_COMPILER_OPTIONS -Werror -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation)
++set(UNIX_COMPILER_OPTIONS -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation)
  
+ # maybe-unitialzied is only supported by newer versions of GCC.
+ # Unfortunately, it is pretty unreliable and reports wrong results.