diff --git a/srcpkgs/clutter/clutter-devel.template b/srcpkgs/clutter/clutter-devel.template
index 695cbedb051..c367ea57d9d 100644
--- a/srcpkgs/clutter/clutter-devel.template
+++ b/srcpkgs/clutter/clutter-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run gtk+-devel
-Add_dependency run gobject-introspection-devel
+Add_dependency run gobject-introspection
 Add_dependency run MesaLib-devel
 Add_dependency run libX11-devel
 Add_dependency run libXdamage-devel
@@ -20,7 +20,5 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/gir* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
 }
diff --git a/srcpkgs/clutter/gir-clutter.template b/srcpkgs/clutter/gir-clutter.template
new file mode 100644
index 00000000000..8e563de0b28
--- /dev/null
+++ b/srcpkgs/clutter/gir-clutter.template
@@ -0,0 +1,17 @@
+# Template file for 'gir-clutter'.
+#
+short_desc="Clutter introspection data"
+long_desc="${long_desc}
+
+ This package contains the GObject-introspection data of Clutter in
+ binary typelib format."
+
+Add_dependency run gir-freedesktop
+Add_dependency run glib
+Add_dependency run clutter
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index ac305169f0a..21d43245b40 100644
--- a/srcpkgs/clutter/template
+++ b/srcpkgs/clutter/template
@@ -1,18 +1,19 @@
 # Template file for 'clutter'
 pkgname=clutter
-version=1.2.0
+version=1.2.4
 distfiles="http://www.clutter-project.org/sources/clutter/1.2/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-x --with-flavour=glx --with-imagebackend=gdk-pixbuf
  --enable-xinput"
 short_desc="OpenGL based interactive canvas library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=009058e3b0985d34b94527440ad0f4444dba66c1c5f2ca036fa2b846fd32c3c8
+checksum=14528674af19eca4f6638c6e1e0ac07e40d047a6a31bac2f8cbb6ee0349ccb65
 long_desc="
  Clutter is an open source software library for creating fast, visually
  rich and animated graphical user interfaces."
 
-subpackages="$pkgname-devel"
+subpackages="gir-$pkgname $pkgname-devel"
+
 Add_dependency run glibc
 Add_dependency run glib
 Add_dependency run pango
@@ -30,7 +31,6 @@ Add_dependency build pango-devel
 Add_dependency build cairo-devel
 Add_dependency build glib-devel
 Add_dependency build gtk+-devel
-Add_dependency build gobject-introspection-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libX11-devel
 Add_dependency build libXext-devel
@@ -38,3 +38,10 @@ Add_dependency build libXdamage-devel
 Add_dependency build libXfixes-devel
 Add_dependency build libXcomposite-devel
 Add_dependency build libXi-devel
+Add_dependency build gobject-introspection
+
+pre_configure()
+{
+	# Use cmp(1) from diffutils.
+	export PATH="/usr/bin:$PATH"
+}
diff --git a/srcpkgs/gir-clutter b/srcpkgs/gir-clutter
new file mode 120000
index 00000000000..5a89e25ad77
--- /dev/null
+++ b/srcpkgs/gir-clutter
@@ -0,0 +1 @@
+clutter
\ No newline at end of file