diff --git a/macros.mingw32 b/macros.mingw32
index 542af12..e791e03 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -25,6 +25,7 @@
 
 %mingw32_cflags          %{mingw32_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_cppflags        %{nil}
+%mingw32_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_ldflags         -fstack-protector -lssp
 
 %mingw32_cc              %{mingw32_target}-gcc
@@ -73,6 +74,8 @@
     ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
     CXXFLAGS=; export CXXFLAGS; \
   fi; \
+  FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
   for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
@@ -155,6 +158,8 @@
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
   CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\
   CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \\\
+  FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \\\
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 2411144..81c10aa 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -25,6 +25,7 @@
 
 %mingw64_cflags          %{mingw64_cppflags} -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_cppflags        %{nil}
+%mingw64_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_ldflags         -fstack-protector -lssp
 
 %mingw64_cc              %{mingw64_target}-gcc
@@ -73,6 +74,8 @@
     ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
     CXXFLAGS=; export CXXFLAGS; \
   fi; \
+  FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
   for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
     x=`basename $i|tr "a-z+-." "A-ZX_"`; \
@@ -155,6 +158,8 @@
   unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
   CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\
   CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \\\
+  FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
+  FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \\\
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 7de95de..24963fa 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        128
-Release:        2%{?dist}
+Version:        129
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sat Jan 22 2022 Sandro Mani <manisandro@gmail.com> - 129-1
+- Also set FCFLAGS in mingw-env
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild