diff --git a/macros.mingw32 b/macros.mingw32
index 719c7d7..b9a635f 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -25,7 +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_ldflags         %{nil}
+%mingw32_ldflags         -fstack-protector
 
 %mingw32_cc              %{mingw32_target}-gcc
 %mingw32_cxx             %{mingw32_target}-g++
diff --git a/macros.mingw64 b/macros.mingw64
index 425bc13..9bc2113 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -25,7 +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_ldflags         %{nil}
+%mingw64_ldflags         -fstack-protector
 
 %mingw64_cc              %{mingw64_target}-gcc
 %mingw64_cxx             %{mingw64_target}-g++
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 747e9a8..37cba09 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        114
+Version:        115
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Jul 02 2020 Sandro Mani <manisandro@gmail.com> - 115-1
+- Add -fstack-protector to LDFLAGS (since we carry -D_FORTIFY_SOURCE=2 in cflags, see https://sourceforge.net/p/mingw-w64/bugs/818/)
+
 * Tue Jul 14 2020 Daniel P. Berrangé <berrange@redhat.com> - 114-1
 - Add meson hint for libgcrypt-config on mingw cross builds (#1856446)