diff --git a/mingw-libgpg-error.spec b/mingw-libgpg-error.spec
index 0cf002f..0f2d6cd 100644
--- a/mingw-libgpg-error.spec
+++ b/mingw-libgpg-error.spec
@@ -1,9 +1,9 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 %global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 Name:           mingw-libgpg-error
 Version:        1.6
@@ -43,7 +43,7 @@ Summary:         MinGW Windows zlib compression library for the win32 target
 MinGW Windows GnuPGP error library.
 
 
-%{_mingw32_debug_package}
+%{mingw32_debug_package}
 
 
 %prep
@@ -52,7 +52,7 @@ MinGW Windows GnuPGP error library.
 
 
 %build
-%{_mingw32_configure}
+%{mingw32_configure}
 make %{?_smp_mflags}
 
 
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgpg-error.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libgpg-error.a
 
 %find_lang libgpg-error
 
@@ -71,19 +71,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mingw32-libgpg-error -f libgpg-error.lang
 %defattr(-,root,root)
-%{_mingw32_bindir}/gpg-error-config
-%{_mingw32_bindir}/gpg-error.exe
-%{_mingw32_bindir}/libgpg-error-0.dll
-%{_mingw32_libdir}/libgpg-error.dll.a
-%{_mingw32_libdir}/libgpg-error.la
-%{_mingw32_includedir}/gpg-error.h
-%{_mingw32_datadir}/aclocal/gpg-error.m4
-%{_mingw32_datadir}/common-lisp/source/gpg-error/*
+%{mingw32_bindir}/gpg-error-config
+%{mingw32_bindir}/gpg-error.exe
+%{mingw32_bindir}/libgpg-error-0.dll
+%{mingw32_libdir}/libgpg-error.dll.a
+%{mingw32_libdir}/libgpg-error.la
+%{mingw32_includedir}/gpg-error.h
+%{mingw32_datadir}/aclocal/gpg-error.m4
+%{mingw32_datadir}/common-lisp/source/gpg-error/*
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.6-17
 - Renamed the source package to mingw-libgpg-error (RHBZ #800913)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.6-16
 - Rebuild against the mingw-w64 toolchain