diff --git a/Make.rules.in b/Make.rules.in
index 0f9c02a6f5e..7b571ed6086 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -61,7 +61,6 @@ ALLCFLAGS    = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLA
 ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
 IDLFLAGS     = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
 TARGETFLAGS  = @TARGETFLAGS@
-WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS)
 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
 BUILDICON    = $(TOPSRCDIR)/tools/buildicon
@@ -73,7 +72,7 @@ MAKECTESTS   = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT)
 WRC          = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
 WMC          = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT)
 WIDL         = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT)
-WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR)
+WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) @UNWINDFLAGS@
 CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) --lib-suffix=.cross.a
 RELPATH      = $(TOOLSDIR)/tools/relpath$(TOOLSEXT)
 SFNT2FNT     = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT)
diff --git a/configure b/configure
index e021e48f0da..6db971ad455 100755
--- a/configure
+++ b/configure
@@ -607,6 +607,7 @@ SOCKETLIBS
 CRTLIBS
 TOOLSEXT
 LDPATH
+UNWINDFLAGS
 BUILTINFLAG
 EXTRACFLAGS
 LIBKSTAT
@@ -12195,6 +12196,8 @@ then
 
 $as_echo "#define __ASM_CFI(str) str" >>confdefs.h
 
+   UNWINDFLAGS=-fasynchronous-unwind-tables
+
 else
    $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h
 
@@ -13932,6 +13935,7 @@ esac
 
 
 
+
 ac_config_commands="$ac_config_commands include/stamp-h"
 
 
diff --git a/configure.ac b/configure.ac
index f39347ed1c9..bd1276b686e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1693,6 +1693,7 @@ then
    asm_func_header="$asm_func_header.cfi_startproc\\n\\t"
    asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer"
    AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op])
+   AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables])
 else
    AC_DEFINE([__ASM_CFI(str)],[""])
 fi