diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 88c8a35..78d2375 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 25 10:39:23 UTC 2016 - olaf@aepfle.de
+
+- Using -g for CFLAGS is controlled via project settings, it should
+  not be enforced by the mozilla buildsystem.
+
 -------------------------------------------------------------------
 Mon Jan 18 07:32:51 UTC 2016 - olaf@aepfle.de
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index d460769..984ffd3 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -244,6 +244,10 @@ export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 export CXXFLAGS="$CFLAGS"
 export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
+# -g might be part of RPM_OPT_FLAGS, depending on the debuginfo setting in prj config
+# gcc lacks a an explicit -noop, so use something similar to make sure -g
+# is not forced into CFLAGS
+export MOZ_DEBUG_FLAGS="-pipe"
 #
 cat << EOF > $MOZCONFIG
 mk_add_options MOZILLA_OFFICIAL=1