diff --git a/Changelog b/Changelog
index da60a11..cfaedb7 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2c01]
 
+* Fix alloca warnings on freebsd. (caf)
+
 * Fix memory leak in banlist.c. (caf)
 
 * Apply a fix contributed by cpet for the configure script on
diff --git a/include/irc_std.h b/include/irc_std.h
index 7c7a47e..621fdc9 100644
--- a/include/irc_std.h
+++ b/include/irc_std.h
@@ -113,7 +113,9 @@
  * I took this from the autoconf documentation
  */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H)
-# define alloca __builtin_alloca
+# ifndef alloca
+#  define alloca __builtin_alloca
+# endif
 #else
 # if HAVE_ALLOCA_H
 #  include <alloca.h>