diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index fd20dd30fa..81b426726d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-10  Mark Mitchell  <mark@codesourcery.com>
+
+	* doc/Makefile.am (config.texi): Set top_srcdir.
+	* doc/Makefile.in: Regenerated.
+	* doc/binutils.texi: Use at-file.texi from libiberty.
+
 2005-10-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/1436
diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am
index edda4a0d9f..64c35fd035 100644
--- a/binutils/doc/Makefile.am
+++ b/binutils/doc/Makefile.am
@@ -39,6 +39,7 @@ config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
+	echo "@set top_srcdir $(top_srcdir)" >> config.texi
 
 # Man page generation from texinfo
 addr2line.1:	$(binutils_TEXI)
diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in
index 03d945b0d3..4df27fe22e 100644
--- a/binutils/doc/Makefile.in
+++ b/binutils/doc/Makefile.in
@@ -570,6 +570,7 @@ config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
+	echo "@set top_srcdir $(top_srcdir)" >> config.texi
 
 # Man page generation from texinfo
 addr2line.1:	$(binutils_TEXI)
diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index d80e0ea14b..aa4406b83a 100644
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -3453,19 +3453,7 @@ The following command-line options are supported by all of the
 programs described in this manual.
 
 @table @env
-@item @@@var{file}
-Read command-line options from @var{file}.  The options read are
-inserted in place of the original @@@var{file} option.  If @var{file}
-does not exist, or cannot be read, then the option will be treated
-literally, and not removed.  
-
-Options in @var{file} are separated by whitespace.  A whitespace
-character may be included in an option by surrounding the entire
-option in either single or double quotes.  Any character (including a
-backslash) may be included by prefixing the character to be included
-character with a backslash.  The @var{file} may itself contain
-additional @@@var{file} options; any such options will be processed
-recursively.
+@include @value{top_srcdir}/../libiberty/at-file.texi
 
 @item --help
 Display the command-line options supported by the program.