diff --git a/toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch b/toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch
index 32fc9da9627..2d7272ef951 100644
--- a/toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/5.4.0/910-mbsd_multi.patch
@@ -159,8 +159,8 @@
  Make all warnings into hard errors.  Source code which triggers warnings
  will be rejected.
  
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
++@item -Werror-maybe-reset
++@opindex Werror-maybe-reset
 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
 +variable is set to anything other than 0 or empty.
 +
@@ -182,13 +182,13 @@
  @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
  @option{-Wno-pointer-sign}.
  
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
++@item -Werror-maybe-reset
++@opindex Werror-maybe-reset
 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
 +variable is set to anything other than 0 or empty.
 +
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
++@item -fhonour-copts
++@opindex fhonour-copts
 +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
 +given at least once, and warn if it is given more than once.
 +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
diff --git a/toolchain/gcc/patches/6.3.0/910-mbsd_multi.patch b/toolchain/gcc/patches/6.3.0/910-mbsd_multi.patch
index 62203dfcf6a..b747935f0f8 100644
--- a/toolchain/gcc/patches/6.3.0/910-mbsd_multi.patch
+++ b/toolchain/gcc/patches/6.3.0/910-mbsd_multi.patch
@@ -159,8 +159,8 @@
  Make all warnings into hard errors.  Source code which triggers warnings
  will be rejected.
  
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
++@item -Werror-maybe-reset
++@opindex Werror-maybe-reset
 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
 +variable is set to anything other than 0 or empty.
 +
@@ -182,13 +182,13 @@
  @option{-Wall} and by @option{-Wpedantic}, which can be disabled with
  @option{-Wno-pointer-sign}.
  
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
++@item -Werror-maybe-reset
++@opindex Werror-maybe-reset
 +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
 +variable is set to anything other than 0 or empty.
 +
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
++@item -fhonour-copts
++@opindex fhonour-copts
 +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
 +given at least once, and warn if it is given more than once.
 +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not