diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec
index edf6497..8c39404 100644
--- a/mingw32-binutils.spec
+++ b/mingw32-binutils.spec
@@ -11,10 +11,10 @@ Source0:        http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  texinfo
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 95
 
 # NB: This must be left in.
-Requires:       mingw32-filesystem >= 65
+Requires:       mingw32-filesystem >= 95
 
 
 %description
@@ -53,18 +53,31 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
+# Temporary provide mingw-strip, mingw-objdump and mingw-objcopy
+# in preparation for win32+win64 support
+ln -s %{_mingw32_strip} $RPM_BUILD_ROOT%{_bindir}/%{mingw_strip}
+ln -s %{_mingw32_objdump} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objdump}
+ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
+
 
 %files
 %{_mandir}/man1/*
-%{_bindir}/i686-pc-mingw32-*
-%{_prefix}/i686-pc-mingw32/bin/*
-%{_prefix}/i686-pc-mingw32/lib/ldscripts
+%{_bindir}/%{mingw_strip}
+%{_bindir}/%{mingw_objdump}
+%{_bindir}/%{mingw_objcopy}
+%{_bindir}/%{_mingw32_target}-*
+%{_prefix}/%{_mingw32_target}/bin/*
+%{_prefix}/%{_mingw32_target}/lib/ldscripts
 
 
 %changelog
 * Sat Feb 25 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.22.52-1
 - Update to 2.22.52 20120225 snapshot
+- Bump the BR/R: mingw32-filesystem to >= 95
+- Rebuild using the i686-w64-mingw32 triplet
 - Dropped some obsolete configure arguments
+- Temporary provide mingw-strip, mingw-objdump and mingw-objcopy
+  in preparation for win32+win64 support
 
 * Tue Jan 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.22-1
 - Update to 2.22