diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4b66e024d..062847f8f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-02  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* Makefile.in: Allow CFLAGS to be overridden from the environment.
+
 2011-05-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* thread.cc (cancelable_wait): Remove test for main thread.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index ee6f251c2..3932bbdeb 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -58,7 +58,7 @@ override INSTALL_DATA:=@INSTALL_DATA@
 MT_SAFE:=@MT_SAFE@
 DEFS:=@DEFS@
 CCEXTRA:=
-CFLAGS=@CFLAGS@
+CFLAGS?=@CFLAGS@
 override CFLAGS+=-MMD ${$(*F)_CFLAGS} -Werror -fmerge-constants -ftracer \
   -mno-use-libstdc-wrappers $(CCEXTRA)
 CXX=@CXX@