diff --git a/mingw-glib2.spec b/mingw-glib2.spec
index 959ef8c..5bc4183 100644
--- a/mingw-glib2.spec
+++ b/mingw-glib2.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-glib2
 Version:        2.31.18
@@ -48,7 +48,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows GLib2 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -60,7 +60,7 @@ Static version of the MinGW Windows GLib2 library.
 # build GLib twice here
 mkdir build_static
 pushd build_static
-        %{_mingw32_configure} --disable-shared --enable-static
+        %{mingw32_configure} --disable-shared --enable-static
         # HACK
         cp glib/glibconfig.h ../glib
         make %{?_smp_mflags}
@@ -68,7 +68,7 @@ popd
 
 mkdir build_shared
 pushd build_shared
-        %{_mingw32_configure} --disable-static
+        %{mingw32_configure} --disable-static
         # HACK
         cp glib/glibconfig.h ../glib
         make %{?_smp_mflags}
@@ -82,14 +82,14 @@ 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='libgio-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgio-2.0.la
-sed -i s/"old_library=''"/"old_library='libglib-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libglib-2.0.la
-sed -i s/"old_library=''"/"old_library='libgobject-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgobject-2.0.la
-sed -i s/"old_library=''"/"old_library='libgmodule-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgmodule-2.0.la
-sed -i s/"old_library=''"/"old_library='libgthread-2.0.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgthread-2.0.la
+sed -i s/"old_library=''"/"old_library='libgio-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgio-2.0.la
+sed -i s/"old_library=''"/"old_library='libglib-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libglib-2.0.la
+sed -i s/"old_library=''"/"old_library='libgobject-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgobject-2.0.la
+sed -i s/"old_library=''"/"old_library='libgmodule-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgmodule-2.0.la
+sed -i s/"old_library=''"/"old_library='libgthread-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgthread-2.0.la
 
 # There's also a small difference in the file glibconfig.h between the
 # shared and the static build:
@@ -115,85 +115,86 @@ sed -i s/"old_library=''"/"old_library='libgthread-2.0.a'"/ $RPM_BUILD_ROOT%{_mi
 # Drop the folder which was temporary used for installing the static bits
 rm -rf $RPM_BUILD_ROOT/build_static
 
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
 
 # Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gdb
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gdb
 
 # Remove the gtk-doc documentation and manpages which duplicate Fedora native
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 # Bash-completion files aren't interesting for mingw32
-rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/bash_completion.d
+rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/bash_completion.d
 
 # The .def files are also of no use to other binaries
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
 
 # The gdbus-codegen pieces are already in the native glib2 package
-rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/gdbus-codegen
-rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/gdbus-codegen
+rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gdbus-2.0
 
 %find_lang glib20
 
 
 %files -n mingw32-glib2 -f glib20.lang
-%{_mingw32_bindir}/gdbus.exe
-%{_mingw32_bindir}/gio-querymodules.exe
-%{_mingw32_bindir}/glib-compile-resources.exe
-%{_mingw32_bindir}/glib-compile-schemas.exe
-%{_mingw32_bindir}/glib-genmarshal.exe
-%{_mingw32_bindir}/glib-gettextize
-%{_mingw32_bindir}/glib-mkenums
-%{_mingw32_bindir}/gobject-query.exe
-%{_mingw32_bindir}/gresource.exe
-%{_mingw32_bindir}/gsettings.exe
-%{_mingw32_bindir}/gspawn-win32-helper-console.exe
-%{_mingw32_bindir}/gspawn-win32-helper.exe
-%{_mingw32_bindir}/libgio-2.0-0.dll
-%{_mingw32_bindir}/libglib-2.0-0.dll
-%{_mingw32_bindir}/libgmodule-2.0-0.dll
-%{_mingw32_bindir}/libgobject-2.0-0.dll
-%{_mingw32_bindir}/libgthread-2.0-0.dll
-%{_mingw32_includedir}/glib-2.0/
-%{_mingw32_includedir}/gio-win32-2.0/
-%{_mingw32_libdir}/glib-2.0/
-%dir %{_mingw32_libdir}/gio/
-%dir %{_mingw32_libdir}/gio/modules/
-%{_mingw32_libdir}/libgio-2.0.dll.a
-%{_mingw32_libdir}/libgio-2.0.la
-%{_mingw32_libdir}/libglib-2.0.dll.a
-%{_mingw32_libdir}/libglib-2.0.la
-%{_mingw32_libdir}/libgmodule-2.0.dll.a
-%{_mingw32_libdir}/libgmodule-2.0.la
-%{_mingw32_libdir}/libgobject-2.0.dll.a
-%{_mingw32_libdir}/libgobject-2.0.la
-%{_mingw32_libdir}/libgthread-2.0.dll.a
-%{_mingw32_libdir}/libgthread-2.0.la
-%{_mingw32_libdir}/pkgconfig/gio-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gio-windows-2.0.pc
-%{_mingw32_libdir}/pkgconfig/glib-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gmodule-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gobject-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gthread-2.0.pc
-%{_mingw32_datadir}/aclocal/glib-2.0.m4
-%{_mingw32_datadir}/aclocal/glib-gettext.m4
-%{_mingw32_datadir}/aclocal/gsettings.m4
-%{_mingw32_datadir}/glib-2.0/
+%{mingw32_bindir}/gdbus.exe
+%{mingw32_bindir}/gio-querymodules.exe
+%{mingw32_bindir}/glib-compile-resources.exe
+%{mingw32_bindir}/glib-compile-schemas.exe
+%{mingw32_bindir}/glib-genmarshal.exe
+%{mingw32_bindir}/glib-gettextize
+%{mingw32_bindir}/glib-mkenums
+%{mingw32_bindir}/gobject-query.exe
+%{mingw32_bindir}/gresource.exe
+%{mingw32_bindir}/gsettings.exe
+%{mingw32_bindir}/gspawn-win32-helper-console.exe
+%{mingw32_bindir}/gspawn-win32-helper.exe
+%{mingw32_bindir}/libgio-2.0-0.dll
+%{mingw32_bindir}/libglib-2.0-0.dll
+%{mingw32_bindir}/libgmodule-2.0-0.dll
+%{mingw32_bindir}/libgobject-2.0-0.dll
+%{mingw32_bindir}/libgthread-2.0-0.dll
+%{mingw32_includedir}/glib-2.0/
+%{mingw32_includedir}/gio-win32-2.0/
+%{mingw32_libdir}/glib-2.0/
+%dir %{mingw32_libdir}/gio/
+%dir %{mingw32_libdir}/gio/modules/
+%{mingw32_libdir}/libgio-2.0.dll.a
+%{mingw32_libdir}/libgio-2.0.la
+%{mingw32_libdir}/libglib-2.0.dll.a
+%{mingw32_libdir}/libglib-2.0.la
+%{mingw32_libdir}/libgmodule-2.0.dll.a
+%{mingw32_libdir}/libgmodule-2.0.la
+%{mingw32_libdir}/libgobject-2.0.dll.a
+%{mingw32_libdir}/libgobject-2.0.la
+%{mingw32_libdir}/libgthread-2.0.dll.a
+%{mingw32_libdir}/libgthread-2.0.la
+%{mingw32_libdir}/pkgconfig/gio-2.0.pc
+%{mingw32_libdir}/pkgconfig/gio-windows-2.0.pc
+%{mingw32_libdir}/pkgconfig/glib-2.0.pc
+%{mingw32_libdir}/pkgconfig/gmodule-2.0.pc
+%{mingw32_libdir}/pkgconfig/gmodule-export-2.0.pc
+%{mingw32_libdir}/pkgconfig/gmodule-no-export-2.0.pc
+%{mingw32_libdir}/pkgconfig/gobject-2.0.pc
+%{mingw32_libdir}/pkgconfig/gthread-2.0.pc
+%{mingw32_datadir}/aclocal/glib-2.0.m4
+%{mingw32_datadir}/aclocal/glib-gettext.m4
+%{mingw32_datadir}/aclocal/gsettings.m4
+%{mingw32_datadir}/glib-2.0/
 
 %files -n mingw32-glib2-static
-%{_mingw32_libdir}/libgio-2.0.a
-%{_mingw32_libdir}/libglib-2.0.a
-%{_mingw32_libdir}/libgmodule-2.0.a
-%{_mingw32_libdir}/libgobject-2.0.a
-%{_mingw32_libdir}/libgthread-2.0.a
+%{mingw32_libdir}/libgio-2.0.a
+%{mingw32_libdir}/libglib-2.0.a
+%{mingw32_libdir}/libgmodule-2.0.a
+%{mingw32_libdir}/libgobject-2.0.a
+%{mingw32_libdir}/libgthread-2.0.a
 
 
 %changelog
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.31.18-2
 - Renamed the source package to mingw-glib2 (RHBZ #800389)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember@gmail.com> - 2.31.18-1
 - Update to 2.31.18
diff --git a/sources b/sources
index e69de29..86d1058 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0e41bbd820d5a0574eefad30709726b0  glib-2.31.18.tar.xz