diff --git a/mingw-readline.spec b/mingw-readline.spec
index 2bec9ed..e964f35 100644
--- a/mingw-readline.spec
+++ b/mingw-readline.spec
@@ -1,5 +1,5 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 
 Name:           mingw-readline
 Version:        5.2
@@ -83,13 +83,13 @@ popd
 
 
 %build
-%{_mingw32_configure} --enable-shared
+%{mingw32_configure} --enable-shared
 make SHLIB_LIBS=-ltermcap
 
 # Rebuild the DLLs correctly and create implibs.
 pushd shlib
-%{_mingw32_cc} -shared -o readline.dll -Wl,--out-implib,libreadline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
-%{_mingw32_cc} -shared -o history.dll -Wl,--out-implib,libhistory.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
+%{mingw32_cc} -shared -o readline.dll -Wl,--out-implib,libreadline.dll.a readline.so vi_mode.so funmap.so keymaps.so parens.so search.so rltty.so complete.so bind.so isearch.so display.so signals.so util.so kill.so undo.so macro.so input.so callback.so terminal.so text.so nls.so misc.so xmalloc.so history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so tilde.so compat.so -ltermcap
+%{mingw32_cc} -shared -o history.dll -Wl,--out-implib,libhistory.dll.a history.so histexpand.so histfile.so histsearch.so shell.so mbutil.so xmalloc.so
 popd
 
 
@@ -98,35 +98,36 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove the fake .so files and install our DLLs and implibs.
 pushd shlib
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib*.so.*
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
-install readline.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install libreadline.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
-install history.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install libhistory.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/lib*.so.*
+mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
+install readline.dll $RPM_BUILD_ROOT%{mingw32_bindir}
+install libreadline.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}
+install history.dll $RPM_BUILD_ROOT%{mingw32_bindir}
+install libhistory.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}
 popd
 
 # Don't want the info files or manpages which duplicate the native package.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
 
 # Don't want the static library.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libhistory.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libreadline.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libhistory.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libreadline.a
 
 
 %files -n mingw32-readline
-%{_mingw32_bindir}/readline.dll
-%{_mingw32_bindir}/history.dll
-%{_mingw32_libdir}/libreadline.dll.a
-%{_mingw32_libdir}/libhistory.dll.a
-%{_mingw32_includedir}/readline/
+%{mingw32_bindir}/readline.dll
+%{mingw32_bindir}/history.dll
+%{mingw32_libdir}/libreadline.dll.a
+%{mingw32_libdir}/libhistory.dll.a
+%{mingw32_includedir}/readline/
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember@gmail.com> - 5.2-11
 - Renamed the source package to mingw-readline (#801022)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 5.2-10
 - Rebuild against the mingw-w64 toolchain