diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index ce7df517a..c169880e5 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-07  Yaakov Selkowitz  <yselkowi@redhat.com>
+
+	* Makefile.common (COMPILE.cc): Add -fno-use-cxa-atexit.
+
 2014-02-18  Christopher Faylor  <me.cygwin2014@cgf.cx>
 
 	* Makefile.in: Ignore errors on doc install.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index d97ecb08a..d3a46e740 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -23,7 +23,7 @@ opt=$(filter -O%,${CFLAGS}) $(filter -g%,${CFLAGS})
 override CXXFLAGS:=${filter-out -g%,$(filter-out -O%,${CXXFLAGS})} ${opt}
 
 cflags_common:=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0
-COMPILE.cc=c++wrap ${CXXFLAGS} -fno-rtti -fno-exceptions ${cflags_common}
+COMPILE.cc=c++wrap ${CXXFLAGS} -fno-rtti -fno-exceptions -fno-use-cxa-atexit ${cflags_common}
 COMPILE.c=ccwrap ${CFLAGS} ${cflags_common}
 
 top_srcdir:=$(call justdir,${winsup_srcdir})