diff --git a/src/ChangeLog b/src/ChangeLog
index ab85f4c3..bc1c04ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-27  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* config-post.h (alloca): Don't #define alloca under MinGW32,
+	which defines it in malloc.h, included from mswindows.h.
+
 2005-06-27  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* utils.c (get_grouping_data): Force the use of separators in C
diff --git a/src/config-post.h b/src/config-post.h
index ed69cf81..4c99fb8d 100644
--- a/src/config-post.h
+++ b/src/config-post.h
@@ -57,7 +57,9 @@
 #if HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
-# define alloca __builtin_alloca
+# ifndef __MINGW32__
+#  define alloca __builtin_alloca
+# endif
 #elif defined _AIX
 # define alloca __alloca
 #elif defined _MSC_VER