diff --git a/gcc/configure b/gcc/configure
index e2c0a13..dc3601f 100755  
--- a/gcc/configure
+++ b/gcc/configure
@@ -25104,7 +25104,7 @@ fi
 if test "${enable_linker_build_id+set}" = set; then :
   enableval=$enable_linker_build_id;
 else
-  enable_linker_build_id=no
+  enable_linker_build_id=$gcc_cv_ld_buildid
 fi
 
 
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 14690d3..dfcac06 100644  
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4115,7 +4115,7 @@ AC_ARG_ENABLE(linker-build-id,
 [  --enable-linker-build-id
                           compiler will always pass --build-id to linker],
 [],
-enable_linker_build_id=no)
+[enable_linker_build_id=$gcc_cv_ld_buildid])
 
 if test x"$enable_linker_build_id" = xyes; then
   if test x"$gcc_cv_ld_buildid" = xyes; then
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index ce6b5cf..ab5bf3b 100644  
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1635,12 +1635,14 @@ building runtime libraries.  @samp{@var{
 list of maps of the form @samp{@var{old}=@var{new}}.
 
 @item --enable-linker-build-id
-Tells GCC to pass @option{--build-id} option to the linker for all final
+@itemx --disable-linker-build-id
+Tells GCC to pass the @option{--build-id} option to the linker for all final
 links (links performed without the @option{-r} or @option{--relocatable}
 option), if the linker supports it.  If you specify
 @option{--enable-linker-build-id}, but your linker does not
-support @option{--build-id} option, a warning is issued and the
-@option{--enable-linker-build-id} option is ignored.  The default is off.
+support the @option{--build-id} option, a warning is issued and the
+@option{--enable-linker-build-id} option is ignored.
+The default is on if the linker supports it.
 
 @item --enable-gnu-unique-object
 @itemx --disable-gnu-unique-object