diff --git a/mingw32-glib2.spec b/mingw-glib2.spec
similarity index 95%
rename from mingw32-glib2.spec
rename to mingw-glib2.spec
index b69fe4f..959ef8c 100644
--- a/mingw32-glib2.spec
+++ b/mingw-glib2.spec
@@ -2,9 +2,9 @@
 %global __objdump %{_mingw32_objdump}
 %define __debug_install_post %{_mingw32_debug_install_post}
 
-Name:           mingw32-glib2
+Name:           mingw-glib2
 Version:        2.31.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GLib2 library
 
 License:        LGPLv2+
@@ -33,12 +33,18 @@ BuildRequires:  glib2-devel >= 2.31.14
 %description
 MinGW Windows Glib2 library.
 
-%package static
+%package -n mingw32-glib2
+Summary:         MinGW Windows zlib compression library for the win32 target
+
+%description -n mingw32-glib2
+MinGW Windows Glib2 library.
+
+%package -n mingw32-glib2-static
 Summary:        Static version of the MinGW Windows GLib2 library
-Requires:       %{name} = %{version}-%{release}
+Requires:       mingw32-glib2 = %{version}-%{release}
 Group:          Development/Libraries
 
-%description static
+%description -n mingw32-glib2-static
 Static version of the MinGW Windows GLib2 library.
 
 
@@ -131,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0
 %find_lang glib20
 
 
-%files -f glib20.lang
+%files -n mingw32-glib2 -f glib20.lang
 %{_mingw32_bindir}/gdbus.exe
 %{_mingw32_bindir}/gio-querymodules.exe
 %{_mingw32_bindir}/glib-compile-resources.exe
@@ -177,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0
 %{_mingw32_datadir}/aclocal/gsettings.m4
 %{_mingw32_datadir}/glib-2.0/
 
-%files static
+%files -n mingw32-glib2-static
 %{_mingw32_libdir}/libgio-2.0.a
 %{_mingw32_libdir}/libglib-2.0.a
 %{_mingw32_libdir}/libgmodule-2.0.a
@@ -186,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/gdbus-2.0
 
 
 %changelog
+* Tue Mar 06 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.31.18-2
+- Renamed the source package to mingw-glib2 (RHBZ #800389)
+
 * 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 86d1058..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-0e41bbd820d5a0574eefad30709726b0  glib-2.31.18.tar.xz