diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index b2445603a6d..0e701113bea 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-07  Richard Guenther  <rguenther@suse.de>
+
+	* inclhack.def (glibc_c99_inline_2): Adjust for glibc 2.3
+	systems.
+	* fixincl.x: Regenerate.
+
 2006-11-02  Geoffrey Keating  <geoffk@apple.com>
 
 	* inclhack.def (glibc_c99_inline_1): New.
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 4ace83f27a3..e1e1c380a0a 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  Friday November  3, 2006 at 03:53:48 AM CET
+ * It has been AutoGen-ed  Monday November  6, 2006 at 11:04:01 AM CET
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Nov  3 03:53:48 CET 2006
+/* DO NOT CVS-MERGE THIS FILE, EITHER Mon Nov  6 11:04:01 CET 2006
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -2253,15 +2253,14 @@ static const char* apzGlibc_C99_Inline_2Patch[] = { "sed",
 extern\\\n\
 #endif\\\n\
 __inline__ int \\1/",
-    "-e", "s/extern int __REDIRECT_NTH (\\(stat\\|lstat\\|fstat\\)/#if __STDC_VERSION__ < 199901L\\\n\
+    "-e", "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/#if __STDC_VERSION__ < 199901L\\\n\
 extern\\\n\
 #endif\\\n\
-__inline__ int __REDIRECT_NTH (\\1/",
-    "-e", "/^extern __inline__ int$/ c\\\n\
-#if __STDC_VERSION__ < 199901L\\\n\
+__inline__ int __REDIRECT\\1 (\\2/",
+    "-e", "s/^extern __inline__ int/#if __STDC_VERSION__ < 199901L\\\n\
 extern\\\n\
 #endif\\\n\
-__inline__ int\n",
+__inline__ int/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index bf3517a827c..043f8dbce3d 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1319,12 +1319,12 @@ fix = {
     sed	      = "s/extern int \\(stat\\|lstat\\|fstat\\|mknod\\)/"
 		"#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n"
     		"__inline__ int \\1/";
-    sed	      = "s/extern int __REDIRECT_NTH (\\(stat\\|lstat\\|fstat\\)/"
+    sed	      = "s/extern int __REDIRECT\\(_NTH\\|\\) (\\(stat\\|lstat\\|fstat\\)/"
 		"#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n"
-    		"__inline__ int __REDIRECT_NTH (\\1/";
-    sed	      = "/^extern __inline__ int$/ c\\\n"
+    		"__inline__ int __REDIRECT\\1 (\\2/";
+    sed	      = "s/^extern __inline__ int/"
 		"#if __STDC_VERSION__ < 199901L\\\nextern\\\n#endif\\\n"
-		"__inline__ int\n";
+		"__inline__ int/";
     test_text = <<-EOT
 extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
 extern __inline__ int