diff --git a/.gitignore b/.gitignore
index e69de29..6faa3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/grilo-0.1.15.tar.bz2
diff --git a/grilo.spec b/grilo.spec
new file mode 100644
index 0000000..3e9a869
--- /dev/null
+++ b/grilo.spec
@@ -0,0 +1,115 @@
+Name:           grilo
+Version:        0.1.15
+Release:        2%{?dist}
+Summary:        Content discovery framework
+
+Group:          Applications/Multimedia
+License:        LGPLv2+
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/grilo/0.1/grilo-%{version}.tar.bz2
+Url:            http://live.gnome.org/Grilo
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gnome-common
+BuildRequires:  vala-devel >= 0.7.2
+BuildRequires:  vala-tools >= 0.7.2
+BuildRequires:  gtk-doc
+BuildRequires:  gobject-introspection-devel >= 0.9.0
+BuildRequires:  libxml2-devel
+BuildRequires:  libsoup-devel
+# For the test UI
+BuildRequires:  gtk2-devel GConf2-devel
+
+Requires:       gobject-introspection
+
+%description
+Grilo is a framework that provides access to different sources of
+multimedia content, using a pluggable system.
+This package contains the core library and elements.
+
+%package devel
+Summary:        Libraries/include files for Grilo framework
+Group:          Development/Libraries
+
+Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel gobject-introspection-devel
+
+%description devel
+Grilo is a framework that provides access to different sources of
+multimedia content, using a pluggable system.
+This package contains the core library and elements, as well as
+general and API documentation.
+
+%package vala
+Summary:        Vala language bindings for Grilo framework
+Group:          Development/Libraries
+
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       vala >= 0.7.2
+
+%description vala
+Grilo is a framework that provides access to different sources of
+multimedia content, using a pluggable system.
+This package contains the Vala language bindings.
+
+%prep
+%setup -q
+
+
+%build
+%configure                      \
+        --enable-vala           \
+        --enable-gtk-doc        \
+        --enable-introspection  \
+        --enable-grl-net        \
+        --disable-tests
+
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Remove files that will not be packaged
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_bindir}/grilo-simple-playlist
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README TODO
+%{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/*.typelib
+%{_bindir}/grl-inspect
+%{_bindir}/grilo-test-ui
+
+%files devel
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README TODO
+%{_datadir}/gtk-doc/html/%{name}
+%{_datadir}/gtk-doc/html/%{name}-libs
+%{_includedir}/%{name}-0.1/
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
+
+%files vala
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README TODO
+%{_datadir}/vala-*/vapi/*
+
+%changelog
+* Wed Apr 27 2011 Bastien Nocera <bnocera@redhat.com> 0.1.15-2
+- Update with review comments
+
+* Thu Apr 21 2011 Bastien Nocera <bnocera@redhat.com> 0.1.15-1
+- Fist package, based on upstream work by Juan A.
+  Suarez Romero <jasuarez@igalia.com>
+
diff --git a/sources b/sources
index e69de29..4fde979 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a8519b0c9406733a595c3afb7ce37638  grilo-0.1.15.tar.bz2