diff --git a/libgee.spec b/libgee.spec
index 55fb189..028f7fb 100644
--- a/libgee.spec
+++ b/libgee.spec
@@ -1,6 +1,6 @@
 Name:           libgee
 Version:        0.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GObject collection library
 
 Group:          System Environment/Libraries
@@ -50,9 +50,7 @@ It's planned to provide bindings for further languages.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       gobject-introspection-devel
-# The Vala API binding is only one file; seems superfluous to have a subpackage
-Requires:       vala, pkgconfig
+Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -74,10 +72,7 @@ make %{?_smp_mflags}
 
 
 %check
-# some tests currently broken in Rawhide
-%if ! 0%{?fedora} >= 15
 make check
-%endif
 
 
 %install
@@ -95,18 +90,27 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING MAINTAINERS NEWS README
 %{_libdir}/*.so.*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Gee-1.0.typelib
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/gee-1.0.pc
-%{_libdir}/girepository-1.0/Gee-1.0.typelib
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Gee-1.0.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/gee-1.0.vapi
 
 
 %changelog
+* Thu Sep  1 2011 Michel Salim <salimma@fedoraproject.org> - 0.6.1-3
+- Move typelib file to main package (# 735081)
+- Re-enable unit tests on all Fedora releases
+- -devel subpackage no longer depends on vala and gobject-introspection-devel
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild