diff --git a/src/Makefile.am b/src/Makefile.am
index 8002436e8..3ec54d4ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,9 +32,7 @@ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
 typelibdir = $(pkglibdir)/girepository
 typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib
 
-# After we run g-ir-scanner, we need to change the library name written in
-# the .gir file from the "fake" second copy of the library to the real name
-Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) $(libgnome_shell_la_SOURCES) Makefile
+Shell-0.1.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la Makefile
 	$(G_IR_SCANNER)		\
 		--namespace=Shell			\
 		--nsversion=0.1				\
@@ -53,15 +51,13 @@ Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir
 	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. g-ir-compiler Shell-0.1.gir -o $@
 CLEANFILES += Shell-1.0.typelib
 
-# After we run g-ir-scanner, we need to change the library name written in
-# the .gir file from the "fake" second copy of the library to the real name
-Tidy-1.0.gir: $(tidy_source_h) $(tidy_source_c) Makefile
+Tidy-1.0.gir: $(metacity) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile
 	$(G_IR_SCANNER)					\
 		--namespace=Tidy			\
 		--nsversion=1.0				\
 		--include=Clutter-0.8			\
-		--library=tidy-1.0			\
-		--pkg=clutter-0.8			\
+		--program=metacity			\
+	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
 		$(tidy_source_h)			\
 		$(tidy_source_c)			\
 		$(tidy_cflags)				\