diff --git a/flatpak-rpm-macros.spec b/flatpak-rpm-macros.spec
index e916207..8c76e57 100644
--- a/flatpak-rpm-macros.spec
+++ b/flatpak-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           flatpak-rpm-macros
 Version:        29
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Macros for building RPMS for flatpaks
 Source0:        macros.flatpak
 Source1:        distutils.cfg
@@ -36,6 +36,9 @@ done
 %{_libdir}/python*/distutils/distutils.cfg
 
 %changelog
+* Tue Apr 09 2019 Stephan Bergmann <sbergman@redhat.com> - 29-8
+- Fix CFLAGS and CXXFLAGS (don't lose optimization flags)
+
 * Thu Apr 04 2019 Stephan Bergmann <sbergman@redhat.com> - 29-8
 - Add CFLAGS and CXXFLAGS to macros.flatpak, to match LDFLAGS
 
diff --git a/macros.flatpak b/macros.flatpak
index 5a3a9fa..4a7adf9 100644
--- a/macros.flatpak
+++ b/macros.flatpak
@@ -32,13 +32,13 @@
   export CONFIG_SITE\
   ACLOCAL_PATH="%{_datadir}/aclocal:%{_usr}/share/aclocal"\
   export ACLOCAL_PATH\
-  CFLAGS="%{?__global_compiler_flags}"\
+  CFLAGS="%{optflags}"\
   export CFLAGS\
   CPATH="%{_prefix}/include"\
   export CPATH\
   CPLUS_INCLUDE_PATH="%{_prefix}/include"\
   export CPLUS_INCLUDE_PATH\
-  CXXFLAGS="%{?__global_compiler_flags}"\
+  CXXFLAGS="%{optflags}"\
   export CXXFLAGS\
   C_INCLUDE_PATH="%{_prefix}/include"\
   export C_INCLUDE_PATH\