diff --git a/mingw-libpng.spec b/mingw-libpng.spec
index 8d0c34f..22941e4 100644
--- a/mingw-libpng.spec
+++ b/mingw-libpng.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-libpng
 Version:        1.5.7
@@ -42,7 +42,7 @@ MinGW Windows Libpng library.
 
 This package contains static cross-compiled libraries.
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -50,7 +50,7 @@ This package contains static cross-compiled libraries.
 
 
 %build
-%{_mingw32_configure}
+%{mingw32_configure}
 make %{?_smp_mflags}
 
 
@@ -62,30 +62,31 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # No need to distribute manpages which appear in the Fedora
 # native packages already.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 
 
 %files -n mingw32-libpng
 %doc ANNOUNCE CHANGES LICENSE README TODO
-%{_mingw32_bindir}/libpng-config
-%{_mingw32_bindir}/libpng15-15.dll
-%{_mingw32_bindir}/libpng15-config
-%{_mingw32_includedir}/libpng15
-%{_mingw32_includedir}/png.h
-%{_mingw32_includedir}/pngconf.h
-%{_mingw32_includedir}/pnglibconf.h
-%{_mingw32_libdir}/libpng.dll.a
-%{_mingw32_libdir}/libpng15.dll.a
-%{_mingw32_libdir}/pkgconfig/libpng.pc
-%{_mingw32_libdir}/pkgconfig/libpng15.pc
+%{mingw32_bindir}/libpng-config
+%{mingw32_bindir}/libpng15-15.dll
+%{mingw32_bindir}/libpng15-config
+%{mingw32_includedir}/libpng15
+%{mingw32_includedir}/png.h
+%{mingw32_includedir}/pngconf.h
+%{mingw32_includedir}/pnglibconf.h
+%{mingw32_libdir}/libpng.dll.a
+%{mingw32_libdir}/libpng15.dll.a
+%{mingw32_libdir}/pkgconfig/libpng.pc
+%{mingw32_libdir}/pkgconfig/libpng15.pc
 
 %files -n mingw32-libpng-static
-%{_mingw32_libdir}/libpng.a
-%{_mingw32_libdir}/libpng15.a
+%{mingw32_libdir}/libpng.a
+%{mingw32_libdir}/libpng15.a
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember@gmail.com> - 1.5.7-3
 - Renamed the source package to mingw-libpng (#800430)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.5.7-2
 - Rebuild against the mingw-w64 toolchain