diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 88b0d81f3ae0..d9670d5c0de6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.gcc (*local*): Remove.
+	* doc/install-old.texi: Don't mention local configurations.
+
 2011-07-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/49522
diff --git a/gcc/config.gcc b/gcc/config.gcc
index f8d7274f349f..c190fa74cf96 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -752,17 +752,6 @@ case ${target} in
 esac
 
 case ${target} in
-# Support site-specific machine types.
-*local*)
-	rest=`echo ${target} | sed -e "s/$cpu_type-//"`
-	tm_file=${cpu_type}/$rest.h
-	if test -f $srcdir/config/${cpu_type}/xm-$rest.h
-	then xm_file=${cpu_type}/xm-$rest.h
-	fi
-	if test -f $srcdir/config/${cpu_type}/t-$rest
-	then tmake_file=${cpu_type}/t-$rest
-	fi
-	;;
 alpha*-*-linux*)
 	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h glibc-stdint.h"
 	extra_options="${extra_options} alpha/elf.opt"
diff --git a/gcc/doc/install-old.texi b/gcc/doc/install-old.texi
index e349c63b45fb..0fc8ba4a6306 100644
--- a/gcc/doc/install-old.texi
+++ b/gcc/doc/install-old.texi
@@ -183,13 +183,3 @@ sun4, symmetry, tower-32, tower.
 @noindent
 Remember that a machine name specifies both the cpu type and the company
 name.
-If you want to install your own homemade configuration files, you can
-use @samp{local} as the company name to access them.  If you use
-configuration @samp{@var{cpu}-local}, the configuration name
-without the cpu prefix
-is used to form the configuration file names.
-
-Thus, if you specify @samp{m68k-local}, configuration uses
-files @file{m68k.md}, @file{local.h}, @file{m68k.c},
-@file{xm-local.h}, @file{t-local}, and @file{x-local}, all in the
-directory @file{config/m68k}.
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 54b1f3d73930..06b0c81c0e63 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.host (*local*): Remove.
+
 2011-07-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	PR target/39150
diff --git a/libgcc/config.host b/libgcc/config.host
index 8faeee3ee01a..1b1314f55cdc 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -222,13 +222,6 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
 esac
 
 case ${host} in
-# Support site-specific machine types.
-*local*)
-	rest=`echo ${host} | sed -e "s/$cpu_type-//"`
-	if test -f $srcdir/config/${cpu_type}/t-$rest
-	then tmake_file=${cpu_type}/t-$rest
-	fi
-	;;
 alpha*-*-linux*)
 	tmake_file="${tmake_file} alpha/t-crtfm"
 	extra_parts="$extra_parts crtfastmath.o"