diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3a6ed36cf7..f21b99288c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-09  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* config/i386/cygwin.h (LINK_SPEC): Add -tsaware flag if !mno-cygwin.
+
 2009-11-09  Jason Merrill  <jason@redhat.com>
 
 	* gdbinit.in (pgq): New function for printing gimple sequence.
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 933263769f9..8eb21da4948 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -94,7 +94,7 @@ along with GCC; see the file COPYING3.  If not see
   %{shared|mdll: --enable-auto-image-base -e \
     %{mno-cygwin:_DllMainCRTStartup@12} \
     %{!mno-cygwin:__cygwin_dll_entry@12}}\
-  %{!mno-cygwin:--dll-search-prefix=cyg}"
+  %{!mno-cygwin:--dll-search-prefix=cyg -tsaware}"
 
 /* Allocate space for all of the machine-spec-specific stuff.
    Allocate enough space for cygwin -> mingw32  munging plus