diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 0615a3f..145bf60 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:        127
+Version:        128
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 128-1
+- Add Boost_ARCHITECTURE to cmake toolchain file
+
 * Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 127-1
 - Correctly test whether CC/CXX/FC env-vars are set in cmake toolchain config
 
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 71764ea..36297b5 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -33,3 +33,5 @@ ENDIF()
 SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)
 
+# Workaround failure to detect boost (see #2037724)
+SET(Boost_ARCHITECTURE "-x32")
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
index 2e9ec9d..39b0d65 100644
--- a/toolchain-mingw64.cmake
+++ b/toolchain-mingw64.cmake
@@ -1,5 +1,6 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+
 # specify the cross compiler
 IF(NOT DEFINED ENV{CC})
     SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
@@ -32,3 +33,5 @@ ENDIF()
 SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
 SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)
 
+# Workaround failure to detect boost (see #2037724)
+SET(Boost_ARCHITECTURE "-x64")