diff --git a/ChangeLog b/ChangeLog
index 18e14ebb8..07803fdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
 	* backend/Makefile.in: Disable manual links for shared libraries.
 	  This breaks MacOS X and doesn't seem to be necessary on other
 	  platforms any more.
+	* include/lalloca.h: Don't use builtin alloca on MacOS X.
 
 2003-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
diff --git a/include/lalloca.h b/include/lalloca.h
index 4c15c248c..b766c9f46 100644
--- a/include/lalloca.h
+++ b/include/lalloca.h
@@ -23,7 +23,7 @@
 #define lalloca_h
 
 /* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(HAVE_NSLINKMODULE)
 # define alloca __builtin_alloca
 #else
 # if HAVE_ALLOCA_H