diff --git a/ChangeLog b/ChangeLog
index 34225ab23..d3de00e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-03  Mike Kestner  <mkestner@ximian.com>
+
+	* */Makefile.am : fix gacutil for new package switch
+	* */*.pc.in : fix -libs var for new dll path
+
 2004-05-03  Mike Kestner  <mkestner@ximian.com>
 
 	* configure.in : add some checks for gtkhtml-3.1 and use it if avail.
diff --git a/art/Makefile.am b/art/Makefile.am
index 1323d9267..8ad906c1e 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -61,13 +61,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/art/art-sharp.pc.in b/art/art-sharp.pc.in
index 75323c861..654dd7e15 100644
--- a/art/art-sharp.pc.in
+++ b/art/art-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Art#
 Description: Art# - libart .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:art-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:art-sharp
diff --git a/atk/Makefile.am b/atk/Makefile.am
index d1bb0e38f..253e86a37 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -6,6 +6,7 @@ METADATA = Atk.metadata
 ASSEMBLY_NAME = atk-sharp
 references = /r:../glib/glib-sharp.dll
 
+TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 gapidir = $(datadir)/gapi
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
@@ -48,10 +49,14 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 	$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs
 
 install-data-local:
-	echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
 uninstall-local:
-	echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am
index 6461eabdc..756bf3385 100644
--- a/gconf/GConf.PropertyEditors/Makefile.am
+++ b/gconf/GConf.PropertyEditors/Makefile.am
@@ -40,13 +40,13 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am
index f923b6f37..e6d15ba13 100644
--- a/gconf/GConf/Makefile.am
+++ b/gconf/GConf/Makefile.am
@@ -42,13 +42,13 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/gconf/GConf/gconf-sharp.pc.in b/gconf/GConf/gconf-sharp.pc.in
index 85f84eed6..afa990a22 100644
--- a/gconf/GConf/gconf-sharp.pc.in
+++ b/gconf/GConf/gconf-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: GConf#
 Description: GConf# - GConf .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:gconf-sharp -r:gconf-sharp-peditors
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:gconf-sharp -r:gconf-sharp-peditors
diff --git a/gda/Makefile.am b/gda/Makefile.am
index 5ee6b02a6..0cdc68c41 100644
--- a/gda/Makefile.am
+++ b/gda/Makefile.am
@@ -58,13 +58,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/gda/gda-sharp.pc.in b/gda/gda-sharp.pc.in
index ee5e45445..f4485284b 100644
--- a/gda/gda-sharp.pc.in
+++ b/gda/gda-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Gda#
 Description: Gda# - Gda .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:gda-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:gda-sharp
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 27de8840f..34c403c98 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -8,6 +8,7 @@ METADATA = Gdk.metadata
 ASSEMBLY_NAME = gdk-sharp
 references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll
 
+TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 gapidir = $(datadir)/gapi
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
@@ -86,10 +87,14 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 	$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs
 
 install-data-local:
-	echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
 uninstall-local:
-	echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
diff --git a/glade/Makefile.am b/glade/Makefile.am
index bcfcf5b58..b08642ab1 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -64,13 +64,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/glade/glade-sharp.pc.in b/glade/glade-sharp.pc.in
index 241669e4b..3cbf6da42 100644
--- a/glade/glade-sharp.pc.in
+++ b/glade/glade-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Glade#
 Description: Glade# - Glade .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:glade-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:glade-sharp
diff --git a/glib/Makefile.am b/glib/Makefile.am
index f2cd75eb7..ebe969416 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = glue
 
+TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 ASSEMBLY_NAME = glib-sharp
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
@@ -59,10 +60,14 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.pub
 	$(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)
 
 install-data-local:
-	echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
 uninstall-local:
-	echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
diff --git a/gnome/Makefile.am b/gnome/Makefile.am
index 181ca35e3..a57f91c09 100644
--- a/gnome/Makefile.am
+++ b/gnome/Makefile.am
@@ -95,13 +95,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/gnome/gnome-sharp.pc.in b/gnome/gnome-sharp.pc.in
index 375827aa1..67f34cfb4 100644
--- a/gnome/gnome-sharp.pc.in
+++ b/gnome/gnome-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Gnome#
 Description: Gnome# - GNOME .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:gnome-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:gnome-sharp
diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am
index 5e8e137de..942b39c43 100644
--- a/gnomedb/Makefile.am
+++ b/gnomedb/Makefile.am
@@ -58,13 +58,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/gnomedb/gnomedb-sharp.pc.in b/gnomedb/gnomedb-sharp.pc.in
index c46706bec..c68c81f06 100644
--- a/gnomedb/gnomedb-sharp.pc.in
+++ b/gnomedb/gnomedb-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: GnomeDB#
 Description: GnomeDB# - GNOMEDB .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:gnomedb-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:gnomedb-sharp
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index da06d2e96..fb5483e37 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -8,6 +8,7 @@ METADATA = Gtk.metadata
 ASSEMBLY_NAME = gtk-sharp
 references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll
 
+TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 gapidir = $(datadir)/gapi
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
@@ -107,10 +108,14 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 	$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs
 
 install-data-local:
-	echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
 uninstall-local:
-	echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index d356a089a..85c878c84 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -58,13 +58,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/gtkhtml/gtkhtml-sharp.pc.in b/gtkhtml/gtkhtml-sharp.pc.in
index c4d0061f3..a3abb5503 100644
--- a/gtkhtml/gtkhtml-sharp.pc.in
+++ b/gtkhtml/gtkhtml-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Gtkhtml#
 Description: Gtkhtml# - Gtkhtml .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:gtkhtml-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:gtkhtml-sharp
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 1f0aed7b0..1fb4f3727 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -4,6 +4,7 @@ METADATA = Pango.metadata
 ASSEMBLY_NAME = pango-sharp
 references = /r:../glib/glib-sharp.dll
 
+TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 gapidir = $(datadir)/gapi
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
@@ -51,10 +52,14 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 	$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs
 
 install-data-local:
-	echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
 uninstall-local:
-	echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;
+	@if test -n '$(TARGET)'; then						\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+	fi
 
diff --git a/rsvg/Makefile.am b/rsvg/Makefile.am
index d858b8a22..5e2b6d8a4 100644
--- a/rsvg/Makefile.am
+++ b/rsvg/Makefile.am
@@ -59,13 +59,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/rsvg/rsvg-sharp.pc.in b/rsvg/rsvg-sharp.pc.in
index 1c130308f..adc7bc39e 100644
--- a/rsvg/rsvg-sharp.pc.in
+++ b/rsvg/rsvg-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Rsvg#
 Description: Rsvg# - librsvg .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:rsvg-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:rsvg-sharp
diff --git a/vte/Makefile.am b/vte/Makefile.am
index 1ccc04c02..d1c5c6fe1 100644
--- a/vte/Makefile.am
+++ b/vte/Makefile.am
@@ -57,13 +57,13 @@ $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub
 
 install-data-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /i $(ASSEMBLY) /f /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then						\
-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir)";	\
-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /root $(DESTDIR)$(libdir) || exit 1;	\
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";	\
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
 	fi
 
diff --git a/vte/vte-sharp.pc.in b/vte/vte-sharp.pc.in
index a8cb0b6b6..dd1e662cf 100644
--- a/vte/vte-sharp.pc.in
+++ b/vte/vte-sharp.pc.in
@@ -1,3 +1,4 @@
+PACKAGE=@PACKAGE@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
@@ -6,4 +7,4 @@ libdir=${exec_prefix}/lib
 Name: Vte#
 Description: Vte# - libvte .NET Binding
 Version: @VERSION@
-Libs: -lib:${libdir} -r:vte-sharp
+Libs: -lib:${libdir}/mono/$(PACKAGE) -r:vte-sharp