diff --git a/glib2.changes b/glib2.changes
index c60a095..fddcc4b 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Jun  3 19:11:32 CEST 2010 - vuntz@opensuse.org
+
+- Break a requirement cycle between glib2 and libgio-2_0-0, to fix
+  bnc#595702:
+  + remove libgio-2_0-0 Requires(post)/Requires(postun) from main
+    package
+  + remove glib2 Requires from libglib-2_0-0, libgmodule-2_0-0,
+    libgio-2_0-0, libgthread-2_0-0, libgobject-2_0-0.
+  + add a Recommends for glib2-lang in libglib-2_0-0 to make the
+    translations installed by default.
+- Move some gio files from glib2 to libgio-2_0-0. Unfortunately, it
+  means we get unversioned files in a subpackage for a versioned
+  library, but that's what we really need: /usr/lib/gio belongs
+  there and we have a symlink pointing to
+  /usr/share/applications/defaults.list (so we don't want a
+  dangling symlink).
+
 -------------------------------------------------------------------
 Mon May  3 22:14:54 CEST 2010 - captain.magnus@opensuse.org
 
diff --git a/glib2.spec b/glib2.spec
index f0a6fe6..616b95d 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -52,14 +52,11 @@ BuildRequires:  zlib-devel
 %if %suse_version > 1100
 BuildRequires:  libselinux-devel
 %endif
-# For temporary %%pre script only.
+# For temporary %%posttrans script only.
 PreReq:         coreutils
 PreReq:         /bin/sed
 Requires:       %{name}-branding
 Requires:       %{name}-lang = %{version}
-# we need gio-querymodules to work in %post/%postun
-Requires(post): libgio-2_0-0
-Requires(postun): libgio-2_0-0
 # Conflicts with gnome_defaults.conf from gnome-vfs2 in 10.3
 Conflicts:      gnome-vfs2 < 2.22.0
 # bug437293
@@ -127,7 +124,7 @@ hashes, to a C programmer and is used by Gtk+ and GNOME.
 License:        LGPLv2.1+
 Summary:        A Library with Convenient Functions Written in C
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Recommends:     %{name}-lang = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      glib2-64bit
@@ -142,7 +139,6 @@ to a C programmer and is used by Gtk+ and GNOME.
 License:        LGPLv2.1+
 Summary:        A Library with Convenient Functions Written in C
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      glib2-64bit
@@ -157,7 +153,6 @@ to a C programmer and is used by Gtk+ and GNOME.
 License:        LGPLv2.1+
 Summary:        A Library with Convenient Functions Written in C
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      glib2-64bit
@@ -202,7 +197,6 @@ to a C programmer and is used by Gtk+ and GNOME.
 License:        LGPLv2.1+
 Summary:        A Library with Convenient Functions Written in C
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      glib2-64bit
@@ -334,13 +328,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README NEWS ChangeLog 
-%{_datadir}/applications/defaults.list
 /etc/profile.d/zzz-glib2.*
 /sbin/conf.d/SuSEconfig.glib2
 %{_bindir}/gio-querymodules*
-%dir %{_libdir}/gio
-%dir %{_libdir}/gio/modules
-%ghost %{_libdir}/gio/modules/giomodule.cache
 
 %files branding-upstream
 %defattr(-,root,root)
@@ -365,6 +355,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgio-2_0-0
 %defattr(-, root, root)
 %{_libdir}/libgio*.so.*
+%dir %{_libdir}/gio
+%dir %{_libdir}/gio/modules
+%ghost %{_libdir}/gio/modules/giomodule.cache
+%{_datadir}/applications/defaults.list
 %dir %{_localstatedir}/cache/gio-2.0
 %ghost %{_localstatedir}/cache/gio-2.0/defaults.list