diff --git a/ChangeLog b/ChangeLog
index 5761baf189..6e59892315 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-30  Sven Neumann  <sven@gimp.org>
+
+	Applied a bunch of small changes contributed by Tim Mooney that fix
+	stack corruption on Tru64 and Aix (bug #129867).
+
+	* app/Makefile.am
+	* plug-ins/script-fu/Makefile.am: changed the dependency order so
+	that $(REGEXREPL) is linked earlier.
+
+	* regexrepl/regex.[ch]: fixed check for __STDC__, merged upstream
+	fix for re_max_failures value.
+
 2004-07-30  Sven Neumann  <sven@gimp.org>
 
 	* configure.in: always do the check for perl and use the
diff --git a/app/Makefile.am b/app/Makefile.am
index f4d5b50487..8c9bc1cd02 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -125,6 +125,7 @@ gimp_2_1_LDADD = \
 	$(libgimpthumb)			\
 	$(libgimpmath)			\
 	$(libgimpbase)			\
+	$(REGEXREPL)			\
 	$(GTK_LIBS)			\
 	$(LIBART_LIBS)			\
 	$(PANGOFT2_LIBS)		\
@@ -133,8 +134,7 @@ gimp_2_1_LDADD = \
 	$(GIMP_THREAD_LIBS)		\
 	$(GIMP_MP_LIBS)			\
 	$(RT_LIBS)			\
-	$(INTLLIBS)			\
-	$(REGEXREPL)
+	$(INTLLIBS)
 
 
 if ENABLE_GIMP_CONSOLE
@@ -168,6 +168,7 @@ gimp_console_2_1_LDADD = \
 	$(libgimpthumb)			\
 	$(libgimpmath)			\
 	$(libgimpbase)			\
+	$(REGEXREPL)			\
 	$(GDK_PIXBUF_LIBS)		\
 	$(LIBART_LIBS)			\
 	$(PANGOFT2_LIBS)		\
@@ -176,8 +177,7 @@ gimp_console_2_1_LDADD = \
 	$(GIMP_THREAD_LIBS)		\
 	$(GIMP_MP_LIBS)			\
 	$(RT_LIBS)			\
-	$(INTLLIBS)			\
-	$(REGEXREPL)
+	$(INTLLIBS)
 
 endif
 
diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am
index ff6f9d2349..ceda823a25 100644
--- a/plug-ins/script-fu/Makefile.am
+++ b/plug-ins/script-fu/Makefile.am
@@ -54,8 +54,8 @@ LDADD = \
 	$(libgimpcolor)						\
 	$(libgimpbase)						\
 	siod/libsiod.a						\
+	$(REGEXREPL)						\
 	$(GTK_LIBS)						\
 	$(SOCKET_LIBS)						\
 	$(RT_LIBS)						\
-	$(INTLLIBS)						\
-	$(REGEXREPL)
+	$(INTLLIBS)
diff --git a/regexrepl/regex.c b/regexrepl/regex.c
index 0e967e914d..1cb684b05a 100644
--- a/regexrepl/regex.c
+++ b/regexrepl/regex.c
@@ -215,7 +215,7 @@ init_syntax_once ()
    machines, compilers, `char' and `unsigned char' argument types.
    (Per Bothner suggested the basic approach.)  */
 #undef SIGN_EXTEND_CHAR
-#if __STDC__
+#if defined(__STDC__)
 #define SIGN_EXTEND_CHAR(c) ((signed char) (c))
 #else  /* not __STDC__ */
 /* As in Harbison and Steele.  */
@@ -1064,7 +1064,7 @@ typedef struct
 #if defined (MATCH_MAY_ALLOCATE)
 /* 4400 was enough to cause a crash on Alpha OSF/1,
    whose default stack limit is 2mb.  */
-int re_max_failures = 20000;
+int re_max_failures = 4000;
 #else
 int re_max_failures = 2000;
 #endif
diff --git a/regexrepl/regex.h b/regexrepl/regex.h
index e86dfb4a2b..cb837054b0 100644
--- a/regexrepl/regex.h
+++ b/regexrepl/regex.h
@@ -426,7 +426,7 @@ typedef struct
    unfortunately clutters up the declarations a bit, but I think it's
    worth it.  */
 
-#if __STDC__
+#if defined(__STDC__)
 
 #define _RE_ARGS(args) args