diff --git a/mingw32-winpthreads.changes b/mingw32-winpthreads.changes
index 4d5afb4..764d937 100644
--- a/mingw32-winpthreads.changes
+++ b/mingw32-winpthreads.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 25 17:31:02 UTC 2019 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Use macro _mingw32_ldflags_bootstrap from mingw32-filesystem package
+  for setting LDFLAGS to keep common settings in one place
+- Revert to use mingw32-cross-gcc-bootstrap again
+
 -------------------------------------------------------------------
 Mon Nov 25 09:23:14 UTC 2019 - Ralf Habacker <ralf.habacker@freenet.de>
 
diff --git a/mingw32-winpthreads.spec b/mingw32-winpthreads.spec
index 950f965..4bc1221 100644
--- a/mingw32-winpthreads.spec
+++ b/mingw32-winpthreads.spec
@@ -25,7 +25,7 @@ Group:          Development/Libraries/C and C++
 URL:            http://mingw-w64.sf.net/
 Source:         http://downloads.sf.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
 Source9:        %name-rpmlintrc
-BuildRequires:  mingw32-cross-gcc
+BuildRequires:  mingw32-cross-gcc-bootstrap
 BuildRequires:  mingw32-cross-pkg-config
 BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-runtime
@@ -71,9 +71,12 @@ touch empty.c
 %_mingw32_cc -c empty.c
 %_mingw32_ar rsc libpthread.a empty.o
 popd
+# No ssp support in gcc-cross-bootstrap
+# Hence we use dedicated LDFLAGS (without -fstack-protector)
 %_mingw32_configure \
 	--enable-static \
-	--enable-shared
+	--enable-shared \
+    LDFLAGS="%{_mingw32_ldflags_bootstrap}"
 make %{?_smp_mflags}
 
 %install