diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc1c7a84e96..863d7d2b967 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr  4 00:14:54 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* fixinc/hackshell.tpl: Skip links to directories, to avoid
+	removing them.
+	* fixinc/inclhack.tpl: Likewise.
+	* fixinc/fixinc.sh, fixinc/fixincl.x, fixinc/inclhack.sh: Rebuilt.
+
 Sat Apr  3 23:46:13 1999  David Edelsohn  <edelsohn@gnu.org>
 	
 	* rs6000.md (addsi3, iorsi3, xorsi3, adddi3, iordi3, xordi3,
diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh
index 18f6fc2d92d..3fb77965f2a 100755
--- a/gcc/fixinc/fixincl.sh
+++ b/gcc/fixinc/fixincl.sh
@@ -2,9 +2,9 @@
 #
 # DO NOT EDIT THIS FILE   (fixincl.sh)
 # 
-# It has been autogen-ed  Saturday April  3, 1999 at 05:12:04 PM EST
-# From the definitions    inclhack.def
-# and the template file   inclhack.tpl
+# It has been autogen-ed  Sunday April  4, 1999 at 12:12:26 AM MST
+# From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
+# and the template file   /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
 #
 # 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/fixincl.x b/gcc/fixinc/fixincl.x
index 64cd607b81c..bf8369c18a3 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1,9 +1,9 @@
 /*
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been autogen-ed  Saturday April  3, 1999 at 05:12:03 PM EST
- * From the definitions    inclhack.def
- * and the template file   fixincl.tpl
+ * It has been autogen-ed  Sunday April  4, 1999 at 12:11:03 AM MST
+ * From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
+ * and the template file   /puke/law//egcs/egcs/gcc/fixinc/fixincl.tpl
  *
  * 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/hackshell.tpl b/gcc/fixinc/hackshell.tpl
index 41db1b912dd..9e9af4da140 100644
--- a/gcc/fixinc/hackshell.tpl
+++ b/gcc/fixinc/hackshell.tpl
@@ -8,9 +8,12 @@
   echo Checking header files
   for file in $files; do
 
-    if ( test ! -r ${file} -o \
-    -n "`fgrep 'This file is part of the GNU C Library' ${file}`" )
-    then continue ; fi
+    # Skip unreadable files, symlinks to directories and glibc files
+    if test ! -r "${file}" || test -d "${file}/." \
+       || fgrep 'This file is part of the GNU C Library' "${file}" \
+	    > /dev/null 2>&1; then
+      continue
+    fi
 
     fixlist=""
     DESTFILE=${DESTDIR}/`echo ${file} | sed "s;${FIND_BASE}/;;" `
diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 63a618d35cd..da7d4b215e6 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -2,9 +2,9 @@
 #
 # DO NOT EDIT THIS FILE   (inclhack.sh)
 # 
-# It has been autogen-ed  Saturday April  3, 1999 at 05:12:01 PM EST
-# From the definitions    inclhack.def
-# and the template file   inclhack.tpl
+# It has been autogen-ed  Sunday April  4, 1999 at 12:12:26 AM MST
+# From the definitions    /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
+# and the template file   /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
 #
 # Install modified versions of certain ANSI-incompatible system header
 # files which are fixed to work correctly with ANSI C and placed in a
@@ -343,7 +343,7 @@ while [ $# != 0 ]; do
   #
   cd ${INPUT}
   files=`if $LINKS; then
-    find ${FIND_BASE}/. \( -type f -o -type l \) -print
+    find ${FIND_BASE}/. \( -type f -o \( -type l -exec test ! -d {} \; \) \) -print
   else
     find ${FIND_BASE}/. -type f -print
   fi | \
@@ -352,9 +352,12 @@ while [ $# != 0 ]; do
   echo Checking header files
   for file in $files; do
 
-    if ( test ! -r ${file} -o \
-    -n "`fgrep 'This file is part of the GNU C Library' ${file}`" )
-    then continue ; fi
+    # Skip unreadable files, symlinks to directories and glibc files
+    if test ! -r "${file}" || test -d "${file}/." \
+       || fgrep 'This file is part of the GNU C Library' "${file}" \
+	    > /dev/null 2>&1; then
+      continue
+    fi
 
     fixlist=""
     DESTFILE=${DESTDIR}/`echo ${file} | sed "s;${FIND_BASE}/;;" `
diff --git a/gcc/fixinc/inclhack.tpl b/gcc/fixinc/inclhack.tpl
index ef490f01bbe..376f71dbd15 100644
--- a/gcc/fixinc/inclhack.tpl
+++ b/gcc/fixinc/inclhack.tpl
@@ -334,7 +334,7 @@ while [ $# != 0 ]; do
   cd ${INPUT}[=
 _IF PROGRAM _env ! =]
   files=`if $LINKS; then
-    find ${FIND_BASE}/. \( -type f -o -type l \) -print
+    find ${FIND_BASE}/. \( -type f -o \( -type l -exec test ! -d {} \; \) \) -print
   else
     find ${FIND_BASE}/. -type f -print
   fi | \