diff --git a/mingw-binutils.spec b/mingw-binutils.spec
index 690c327..890a410 100644
--- a/mingw-binutils.spec
+++ b/mingw-binutils.spec
@@ -40,9 +40,9 @@ cd build
 CFLAGS="$RPM_OPT_FLAGS" \
 ../configure \
   --build=%_build --host=%_host \
-  --target=%{_mingw32_target} \
+  --target=%{mingw32_target} \
   --disable-nls \
-  --with-sysroot=%{_mingw32_sysroot} \
+  --with-sysroot=%{mingw32_sysroot} \
   --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --includedir=%{_includedir} \
@@ -63,9 +63,9 @@ 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}
+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 -n mingw32-binutils
@@ -73,14 +73,15 @@ ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
 %{_bindir}/%{mingw_strip}
 %{_bindir}/%{mingw_objdump}
 %{_bindir}/%{mingw_objcopy}
-%{_bindir}/%{_mingw32_target}-*
-%{_prefix}/%{_mingw32_target}/bin/*
-%{_prefix}/%{_mingw32_target}/lib/ldscripts
+%{_bindir}/%{mingw32_target}-*
+%{_prefix}/%{mingw32_target}/bin/*
+%{_prefix}/%{mingw32_target}/lib/ldscripts
 
 
 %changelog
 * Tue Mar  6 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.22.52-2
 - Renamed the source package to mingw-binutils (RHBZ #673786)
+- Use mingw macros without leading underscore
 
 * Sat Feb 25 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.22.52-1
 - Update to 2.22.52 20120225 snapshot