diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index 7ad015b77..14592a3af 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/"
 COPYRIGHT="1992-2012 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2
 	GNU GPL v3"
-REVISION="7"
+REVISION="8"
 SOURCE_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
 CHECKSUM_SHA256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969"
 PATCHES='autoconf-2.69.patchset'
diff --git a/sys-devel/autoconf/patches/autoconf-2.69.patchset b/sys-devel/autoconf/patches/autoconf-2.69.patchset
index a95094865..a1d32277f 100644
--- a/sys-devel/autoconf/patches/autoconf-2.69.patchset
+++ b/sys-devel/autoconf/patches/autoconf-2.69.patchset
@@ -80,3 +80,112 @@ index 4c2ffb5..c1a987b 100644
 -- 
 1.8.3.4
 
+
+From a357718b081f1678748ead5d7cb67c766c930441 Mon Sep 17 00:00:00 2001
+From: Patrice Dumas <pertusus@free.fr>
+Date: Wed, 18 Jul 2012 13:41:45 -0600
+Subject: [PATCH] doc: fix texinfo macro usage
+
+The texinfo manual recommends avoiding the use of a trailing @c in
+any macro designed to be used inline (as is the case with our ovar
+and dvar macros).  Furthermore, passing '@\n' in the middle of a
+macro call is much different than passing '@\n' between arguments
+of a @defmac for line continuation.
+
+* doc/autoconf.texi (ovar, dvar): Don't end macro with @c, since
+these macros are designed to be embedded in one-line usage.
+(Fortran Compiler): Don't split @dvar.
+* THANKS: Update.
+Reported by Stefano Lattarini.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+Copyright-paperwork-exempt: Yes
+---
+ THANKS            |  1 +
+ doc/autoconf.texi | 24 ++++++++++++------------
+ 2 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index 25734d5..8682c87 100644
+--- a/THANKS
++++ b/THANKS
+@@ -316,6 +316,7 @@ Olly Betts                  olly@survex.com
+ Ossama Othman               ossama@debian.org
+ Pallav Gupta                pallavgupta@gmail.com
+ Paolo Bonzini               bonzini@gnu.org
++Patrice Dumas               pertusus@free.fr
+ Patrick Tullmann            tullmann@cs.utah.edu
+ Patrick Welche              prlw1@newn.cam.ac.uk
+ Paul Berrevoets             paul@swi.com
+diff --git a/doc/autoconf.texi b/doc/autoconf.texi
+index 78a2c67..506d966 100644
+--- a/doc/autoconf.texi
++++ b/doc/autoconf.texi
+@@ -15,7 +15,7 @@
+ @c The ARG is an optional argument.  To be used for macro arguments in
+ @c their documentation (@defmac).
+ @macro ovar{varname}
+-@r{[}@var{\varname\}@r{]}@c
++@r{[}@var{\varname\}@r{]}
+ @end macro
+ 
+ @c @dvar(ARG, DEFAULT)
+@@ -23,7 +23,7 @@
+ @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
+ @c for macro arguments in their documentation (@defmac).
+ @macro dvar{varname, default}
+-@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
++@r{[}@var{\varname\} = @samp{\default\}@r{]}
+ @end macro
+ 
+ @c Handling the indexes with Texinfo yields several different problems.
+@@ -8014,10 +8014,10 @@ variables, respectively.  The computed linker flags are cached in
+ @code{ac_cv_f77_libs} or @code{ac_cv_fc_libs}, respectively.
+ @end defmac
+ 
+-@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @
+-  AC_MSG_FAILURE})
+-@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @dvar{action-if-not-found, @
+-  AC_MSG_FAILURE})
++@defmac AC_F77_DUMMY_MAIN (@ovar{action-if-found}, @
++  @dvar{action-if-not-found, AC_MSG_FAILURE})
++@defmacx AC_FC_DUMMY_MAIN (@ovar{action-if-found}, @
++  @dvar{action-if-not-found, AC_MSG_FAILURE})
+ @acindex{F77_DUMMY_MAIN}
+ @cvindex F77_DUMMY_MAIN
+ @acindex{FC_DUMMY_MAIN}
+@@ -8268,8 +8268,8 @@ results in @code{ac_cv_fc_srcext_@var{ext}} and
+ @code{ac_cv_fc_pp_srcext_@var{ext}} variables, respectively.
+ @end defmac
+ 
+-@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @dvar{action-if-failure, @
+-  AC_MSG_FAILURE})
++@defmac AC_FC_PP_DEFINE (@ovar{action-if-success}, @
++  @dvar{action-if-failure, AC_MSG_FAILURE})
+ @acindex{FC_PP_DEFINE}
+ @caindex fc_pp_define
+ 
+@@ -8287,8 +8287,8 @@ The result of this test is cached in the @code{ac_cv_fc_pp_define}
+ variable.
+ @end defmac
+ 
+-@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @dvar{action-if-failure, @
+-  AC_MSG_FAILURE})
++@defmac AC_FC_FREEFORM (@ovar{action-if-success}, @
++  @dvar{action-if-failure, AC_MSG_FAILURE})
+ @acindex{FC_FREEFORM}
+ @caindex fc_freeform
+ 
+@@ -8314,8 +8314,8 @@ The result of this test, or @samp{none} or @samp{unknown}, is cached in
+ the @code{ac_cv_fc_freeform} variable.
+ @end defmac
+ 
+-@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @dvar{action-if-failure, @
+-  AC_MSG_FAILURE})
++@defmac AC_FC_FIXEDFORM (@ovar{action-if-success}, @
++  @dvar{action-if-failure, AC_MSG_FAILURE})
+ @acindex{FC_FIXEDFORM}
+ @caindex fc_fixedform
+ 
+-- 
+1.9.1