diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73853ffc3d0..42955c10434 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-08  Bruce Korb  <bkorb@gnu.org>
+
+	* fixinc/mkfixinc.sh:  fixinc.sco is no longer used
+	* fixinc/genfixes:  inclhack.sh and fixincl.sh are no longer generated
+	* fixinc/inclhack.sh:  deleted
+	* fixinc/hackshell.tpl:  deleted
+	* fixinc/inclhack.tpl:  deleted
+	* fixinc/fixincl.sh:  "DO NOT EDIT" text modified
+
 2000-05-08  Andreas Jaeger  <aj@suse.de>
 
 	* config/mips/linux.h: Remove undefines which disabled .ctor/.dtor
diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index b5b8cdc0f6c..0d42e4a7858 100755
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  DO NOT EDIT THIS FILE - it has been generated
+#  EDIT THIS FILE - it is no longer generated
 #
 # Install modified versions of certain ANSI-incompatible system header
 # files which are fixed to work correctly with ANSI C and placed in a
diff --git a/gcc/fixinc/genfixes b/gcc/fixinc/genfixes
index e9fa5acc027..2a4f6cc3208 100755
--- a/gcc/fixinc/genfixes
+++ b/gcc/fixinc/genfixes
@@ -48,7 +48,7 @@ do
     echo "USAGE: gendefs [ -D<def-name> ... ] [ <output-name> ]"
     echo "WHERE: '<def-name>' specifies a #define test name from inclhack.def"
     echo "  and  '<output-name>' is one of:"
-    echo "       inclhack.sh fixincl.x fixincl.sh machine.h"
+    echo "       fixincl.x machine.h"
     echo "The default is to produce the first three outputs."
     exit 0
     ;;
@@ -60,31 +60,15 @@ do
 done
 
 if [ $# -eq 0 ] ; then
-  ${SHELL} $0 $AG inclhack.sh || exit 1
-  ${SHELL} $0 $AG fixincl.x   || exit 1
-  ${SHELL} $0 $AG fixincl.sh  || exit 1
-  exit 0
+  set -- fixincl.x
 fi
 
 AG="autogen $AG"
 set -e
 
 case "$1" in
-inclhack.sh | */inclhack.sh )
-  if (autogen --help > /dev/null 2>&1)
-  then
-    echo AutoGen-ing inclhack.sh
-    $AG inclhack.def
-  else
-    echo "AutoGen does not appear to be correctly installed."
-    echo "Please download and install:"
-    echo "   ftp://sourceware.cygnus.com/pub/egcs/infrastructure/autogen.tar.gz"
-    touch inclhack.sh
-  fi
-  ;;
-
 fixincl.x | */fixincl.x )
-  if (autogen --help > /dev/null 2>&1)
+  if (${AG} --help > /dev/null 2>&1)
   then
     echo AutoGen-ing fixincl.x
     $AG -T fixincl.tpl -b fixincl inclhack.def
@@ -96,19 +80,6 @@ fixincl.x | */fixincl.x )
   fi
   ;;
 
-fixincl.sh | */fixincl.sh )
-  if (autogen --help > /dev/null 2>&1)
-  then
-    echo AutoGen-ing fixincl.sh
-    $AG -DPROGRAM=1 -b fixincl inclhack.def
-  else
-    echo "AutoGen does not appear to be correctly installed."
-    echo "Please download and install:"
-    echo "   ftp://sourceware.cygnus.com/pub/egcs/infrastructure/autogen.tar.gz"
-    touch fixincl.sh
-  fi
-  ;;
-
 machname.h | */machname.h )
   # This script extracts from the specs file all the predefined macros
   # that are not in the C89 reserved namespace (the reserved namespace
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index 62fff111e66..ca784800ec1 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -53,11 +53,6 @@ case $machine in
 		fixincludes=fixinc.ptx
 		;;
 
-	i[34567]86-*-sco3.2v5* | \
-	i[34567]86-*-sco3.2v4*)
-		fixincludes=fixinc.sco
-		;;
-
 	alpha*-dec-vms* | \
 	arm-semi-aout | armel-semi-aout | \
 	arm-semi-aof | armel-semi-aof | \