diff --git a/mingw-libxml2.spec b/mingw-libxml2.spec
index e492dc4..927cd5c 100644
--- a/mingw-libxml2.spec
+++ b/mingw-libxml2.spec
@@ -1,6 +1,6 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 Name:           mingw-libxml2
 Version:        2.7.8
@@ -55,7 +55,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows XML processing library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -72,14 +72,14 @@ Static version of the MinGW Windows XML processing library.
 mkdir build_static
 pushd build_static
     LDFLAGS="-no-undefined" \
-    %{_mingw32_configure} --without-python --with-modules --enable-static --disable-shared --with-threads=win32 CFLAGS="$CFLAGS -DLIBXML_STATIC_FOR_DLL"
+    %{mingw32_configure} --without-python --with-modules --enable-static --disable-shared --with-threads=win32 CFLAGS="$CFLAGS -DLIBXML_STATIC_FOR_DLL"
     make %{?_smp_mflags}
 popd
 
 mkdir build_shared
 pushd build_shared
     LDFLAGS="-no-undefined" \
-    %{_mingw32_configure} --without-python --with-modules --disable-static --enable-shared --with-threads=win32
+    %{mingw32_configure} --without-python --with-modules --disable-static --enable-shared --with-threads=win32
     make %{?_smp_mflags}
 popd
 
@@ -91,41 +91,42 @@ make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
 # Install all the files from the static build in a seperate folder
 # and move the static libraries to the right location
 make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
-mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
 
 # Manually merge the libtool files
-sed -i s/"old_library=''"/"old_library='libxml2.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libxml2.la
+sed -i s/"old_library=''"/"old_library='libxml2.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libxml2.la
 
 # Drop the folder which was temporary used for installing the static bits
 rm -rf $RPM_BUILD_ROOT/build_static
 
 # Remove documentation which duplicates Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/
 
 
 %files -n mingw32-libxml2
-%{_mingw32_bindir}/libxml2-2.dll
-%{_mingw32_bindir}/xml2-config
-%{_mingw32_bindir}/xmlcatalog.exe
-%{_mingw32_bindir}/xmllint.exe
-%{_mingw32_libdir}/libxml2.dll.a
-%{_mingw32_libdir}/libxml2.la
-%{_mingw32_libdir}/pkgconfig/libxml-2.0.pc
-%{_mingw32_libdir}/xml2Conf.sh
-%{_mingw32_includedir}/libxml2
-%{_mingw32_datadir}/aclocal/*
+%{mingw32_bindir}/libxml2-2.dll
+%{mingw32_bindir}/xml2-config
+%{mingw32_bindir}/xmlcatalog.exe
+%{mingw32_bindir}/xmllint.exe
+%{mingw32_libdir}/libxml2.dll.a
+%{mingw32_libdir}/libxml2.la
+%{mingw32_libdir}/pkgconfig/libxml-2.0.pc
+%{mingw32_libdir}/xml2Conf.sh
+%{mingw32_includedir}/libxml2
+%{mingw32_datadir}/aclocal/*
 
 
 %files -n mingw32-libxml2-static
-%{_mingw32_libdir}/libxml2.a
+%{mingw32_libdir}/libxml2.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember@gmail.com> - 2.7.8-5
 - Renamed the source package to mingw-libxml2 (#800440)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.7.8-4
 - Rebuild against the mingw-w64 toolchain
@@ -186,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/
 - Fixed %%defattr line
 - Added -static subpackage. Applications which want to link
   against this static library needs to add -DLIBXML_STATIC to the CFLAGS
-- This package shouldn't own %%{_mingw32_libdir}/pkgconfig
+- This package shouldn't own %%{mingw32_libdir}/pkgconfig
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.7.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild