diff --git a/configure b/configure
index 771df1e..6b9d723 100755
--- a/configure
+++ b/configure
@@ -4511,6 +4511,13 @@
 
 fi
 
+GCC_NO_BUILTIN=""
+if test "$GCC" = "yes"
+then
+    GCC_NO_BUILTIN="-fno-builtin"
+fi
+
+
 
 MAKE_RULES=Make.rules
 
@@ -4738,6 +4745,7 @@
 s%@XLIB@%$XLIB%g
 s%@DLLFLAGS@%$DLLFLAGS%g
 s%@LDSHARED@%$LDSHARED%g
+s%@GCC_NO_BUILTIN@%$GCC_NO_BUILTIN%g
 /@MAKE_RULES@/r $MAKE_RULES
 s%@MAKE_RULES@%%g
 
diff --git a/configure.in b/configure.in
index ca43e58..725af94 100644
--- a/configure.in
+++ b/configure.in
@@ -625,6 +625,14 @@
     AC_DEFINE(HAVE_MSGHDR_ACCRIGHTS)
 fi
 
+dnl $GCC is set by autoconf
+GCC_NO_BUILTIN=""
+if test "$GCC" = "yes"
+then
+    GCC_NO_BUILTIN="-fno-builtin"
+fi
+AC_SUBST(GCC_NO_BUILTIN)
+
 dnl **** Generate output files ****
 
 MAKE_RULES=Make.rules
diff --git a/relay32/Makefile.in b/relay32/Makefile.in
index 4c1ca52..ab6e02a 100644
--- a/relay32/Makefile.in
+++ b/relay32/Makefile.in
@@ -1,4 +1,4 @@
-DEFS      = @DLLFLAGS@ -D__WINE__
+DEFS      = @DLLFLAGS@ @GCC_NO_BUILTIN@ -D__WINE__
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ..
 SRCDIR    = @srcdir@