diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 1e2b18ebb..ba970f959 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.common: Don't drop -gFOO switches when filtering CFLAGS
+	and CXXFLAGS.
+
 2013-11-06  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
 	* Makefile.in: Properly cd to directory sans install_ prefix.  Report
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index c71845c47..d97ecb08a 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -19,8 +19,8 @@ endef
 export PATH:=${winsup_srcdir}:${PATH}
 
 # Allow CFLAGS=-O,-g to control CXXFLAGS too
-opt=$(filter -O%,${CFLAGS}) $(filter -g,${CFLAGS})
-override CXXFLAGS:=${filter-out -g,$(filter-out -O%,${CXXFLAGS})} ${opt}
+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}