diff --git a/mingw-gtk2.spec b/mingw-gtk2.spec
index 6d7df4d..24aa46c 100644
--- a/mingw-gtk2.spec
+++ b/mingw-gtk2.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-gtk2
 Version:        2.24.10
@@ -12,7 +12,7 @@ Group:          Development/Libraries
 URL:            http://www.gtk.org
 Source0:        http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.xz
 
-# wine %{_mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
+# wine %{mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
 Source1:        gtk.immodules
 
 # Fix use of extended buttons in gtkstatusicon.
@@ -77,7 +77,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Gtk2 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -89,113 +89,114 @@ Static version of the MinGW Windows Gtk2 library.
 
 %build
 # Need to run the correct version of glib-mkenums.
-PATH=%{_mingw32_bindir}:$PATH
+PATH=%{mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static
+%{mingw32_configure} --disable-cups --enable-static
 make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
 
 # Remove manpages which duplicate those in Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 
 # Remove documentation too.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 # The .def files are only used while compiling the libraries themselves
 # (they contain a list of functions which need to be exported by the linker)
 # so they serve no purpose for other libraries and applications
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-win32-2.0.def
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-win32-2.0.def
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gailutil.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gdk-win32-2.0.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-win32-2.0.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gailutil.def
 
 # Install the gtk.immodules file
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
+mkdir -p $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-2.0/
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-2.0/
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # Drop the .dll.a files for all modules as nothing is supposed
 # to link directly to these modules
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-2.0/2.10.0/*/*.dll.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-2.0/modules/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-2.0/2.10.0/*/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-2.0/modules/*.dll.a
 
 %find_lang %{name} --all-name
 
 
 %files -n mingw32-gtk2 -f %{name}.lang
 %doc COPYING
-%{_mingw32_datadir}/themes/*
-%{_mingw32_bindir}/gtk-builder-convert
-%{_mingw32_bindir}/gtk-demo.exe
-%{_mingw32_bindir}/gtk-query-immodules-2.0.exe
-%{_mingw32_bindir}/gtk-update-icon-cache.exe
-%{_mingw32_bindir}/gtk-update-icon-cache.exe.manifest
-%{_mingw32_bindir}/libgailutil-18.dll
-%{_mingw32_bindir}/libgdk-win32-2.0-0.dll
-%{_mingw32_bindir}/libgtk-win32-2.0-0.dll
-%dir %{_mingw32_libdir}/gtk-2.0
-%dir %{_mingw32_libdir}/gtk-2.0/2.10.0
-%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/engines
-%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.dll
-%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.dll
-%{_mingw32_libdir}/gtk-2.0/include/
-%dir %{_mingw32_libdir}/gtk-2.0/modules
-%{_mingw32_libdir}/gtk-2.0/modules/libgail.dll
-%{_mingw32_libdir}/libgailutil.dll.a
-%{_mingw32_libdir}/libgdk-win32-2.0.dll.a
-%{_mingw32_libdir}/libgtk-win32-2.0.dll.a
-%{_mingw32_libdir}/pkgconfig/gail.pc
-%{_mingw32_libdir}/pkgconfig/gdk-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gtk+-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gtk+-win32-2.0.pc
-%{_mingw32_includedir}/gtk-2.0/
-%{_mingw32_includedir}/gail-1.0/
-%{_mingw32_sysconfdir}/gtk-2.0/
-%{_mingw32_datadir}/aclocal/gtk-2.0.m4
-%{_mingw32_datadir}/gtk-2.0/
+%{mingw32_datadir}/themes/*
+%{mingw32_bindir}/gtk-builder-convert
+%{mingw32_bindir}/gtk-demo.exe
+%{mingw32_bindir}/gtk-query-immodules-2.0.exe
+%{mingw32_bindir}/gtk-update-icon-cache.exe
+%{mingw32_bindir}/gtk-update-icon-cache.exe.manifest
+%{mingw32_bindir}/libgailutil-18.dll
+%{mingw32_bindir}/libgdk-win32-2.0-0.dll
+%{mingw32_bindir}/libgtk-win32-2.0-0.dll
+%dir %{mingw32_libdir}/gtk-2.0
+%dir %{mingw32_libdir}/gtk-2.0/2.10.0
+%dir %{mingw32_libdir}/gtk-2.0/2.10.0/engines
+%{mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.dll
+%dir %{mingw32_libdir}/gtk-2.0/2.10.0/immodules
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.dll
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.dll
+%{mingw32_libdir}/gtk-2.0/include/
+%dir %{mingw32_libdir}/gtk-2.0/modules
+%{mingw32_libdir}/gtk-2.0/modules/libgail.dll
+%{mingw32_libdir}/libgailutil.dll.a
+%{mingw32_libdir}/libgdk-win32-2.0.dll.a
+%{mingw32_libdir}/libgtk-win32-2.0.dll.a
+%{mingw32_libdir}/pkgconfig/gail.pc
+%{mingw32_libdir}/pkgconfig/gdk-2.0.pc
+%{mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc
+%{mingw32_libdir}/pkgconfig/gtk+-2.0.pc
+%{mingw32_libdir}/pkgconfig/gtk+-win32-2.0.pc
+%{mingw32_includedir}/gtk-2.0/
+%{mingw32_includedir}/gail-1.0/
+%{mingw32_sysconfdir}/gtk-2.0/
+%{mingw32_datadir}/aclocal/gtk-2.0.m4
+%{mingw32_datadir}/gtk-2.0/
 
 %files -n mingw32-gtk2-static
-%{_mingw32_libdir}/libgailutil.a
-%{_mingw32_libdir}/libgdk-win32-2.0.a
-%{_mingw32_libdir}/libgtk-win32-2.0.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
-%{_mingw32_libdir}/gtk-2.0/modules/libgail.a
+%{mingw32_libdir}/libgailutil.a
+%{mingw32_libdir}/libgdk-win32-2.0.a
+%{mingw32_libdir}/libgtk-win32-2.0.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
+%{mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
+%{mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 
 %changelog
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.24.10-3
 - Renamed the source package to mingw-gtk2 (RHBZ #800392)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.24.10-2
 - Rebuild against the mingw-w64 toolchain