diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index df186d5dc8f..103f5b2e5cb 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -1379,7 +1379,7 @@ tSCC zLimits_IfndefsName[] =
  *  File name selection pattern
  */
 tSCC zLimits_IfndefsList[] =
-  "|limits.h|";
+  "|limits.h|sys/limits.h|";
 /*
  *  Machine/OS name selection pattern
  */
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index c3a06ba1976..51908d8e4f5 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -725,6 +725,7 @@ fix = {
 fix = {
     hackname = limits_ifndefs;
     files  = "limits.h";
+    files  = "sys/limits.h";
     bypass = "ifndef[ \t]+FLT_MIN";
 
     sed  = "/[ \t]FLT_MIN[ \t]/i\\\n#ifndef FLT_MIN\n";
diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 536b0a36273..63f4cf755d7 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -1275,7 +1275,8 @@ struct __file_s;
     #
     # Fix  40:  Limits_Ifndefs
     #
-    case "${file}" in ./limits.h )
+    case "${file}" in ./limits.h | \
+	./sys/limits.h )
     if ( test -z "`egrep 'ifndef[ 	]+FLT_MIN' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}