diff --git a/Makefile.am b/Makefile.am
index 4435e8c64..10ae24481 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ CLEANFILES = $(pc_files)
 AM_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 
 if HAVE_INTROSPECTION
-
 cogl_headers = \
 	$(top_srcdir)/clutter/cogl/cogl-bitmap.h	\
 	$(top_srcdir)/clutter/cogl/cogl-color.h		\
@@ -39,6 +38,13 @@ cogl_headers = \
 	$(top_srcdir)/clutter/cogl/cogl-types.h		\
 	$(top_srcdir)/clutter/cogl/cogl-vertex-buffer.h
 
+# HACK - gobject-introspection can't scan a library in another directory
+# so we create a libclutter-cogl.la that's just identical to the one
+# in the subdir
+noinst_LTLIBRARIES = libclutter-cogl.la
+libclutter_cogl_la_LIBADD = $(CLUTTER_COGL)/libclutter-cogl.la
+libclutter_cogl_la_SOURCES = $(cogl_headers)
+
 Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclutter-cogl.la
 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
 		--namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \
@@ -49,7 +55,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclut
 		-DCLUTTER_COMPILATION \
 		--include=GL-1.0 \
 		--include=GObject-2.0 \
-		--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
+		--library=clutter-cogl \
 		--libtool="$(top_builddir)/doltlibtool" \
 		--pkg gobject-2.0 \
 		--output $@ \
@@ -59,21 +65,8 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(CLUTTER_COGL)/libclut
 
 BUILT_GIRSOURCES = Cogl-@CLUTTER_API_VERSION@.gir
 
-#girdir = $(datadir)/gir-1.0
-#gir_DATA = $(BUILT_GIRSOURCES)
-
-#typelibsdir = $(libdir)/girepository-1.0
-#typelibs_DATA = Cogl-@CLUTTER_API_VERSION@.typelib
-
-#%.typelib: %.gir $(INTROSPECTION_COMPILER)
-#	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) \
-#		--includedir=$(top_builddir)/clutter \
-#		--includedir=$(top_srcdir)/clutter \
-#		--includedir=$(srcdir) \
-#		--includedir=. \
-#		$(INTROSPECTION_COMPILER_OPTS) \
-#		$< -o $(@F)
-
-CLEANFILES += $(BUILT_GIRSOURCES) #$(typelibs_DATA)
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(BUILT_GIRSOURCES)
 
+CLEANFILES += $(BUILT_GIRSOURCES)
 endif