diff -up gtk-sharp-2.10.3/gdk/Makefile.in.old gtk-sharp-2.10.3/gdk/Makefile.in
--- gtk-sharp-2.10.3/gdk/Makefile.in.old	2008-03-04 19:30:47.000000000 +0100
+++ gtk-sharp-2.10.3/gdk/Makefile.in	2008-03-04 19:31:18.000000000 +0100
@@ -296,7 +296,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE@GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE@GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/Makefile.include.old gtk-sharp-2.10.3/Makefile.include
--- gtk-sharp-2.10.3/Makefile.include.old	2008-03-04 19:26:03.000000000 +0100
+++ gtk-sharp-2.10.3/Makefile.include	2008-03-04 19:26:43.000000000 +0100
@@ -54,7 +54,7 @@ $(POLICY_ASSEMBLIES): $(top_builddir)/po
 	done
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 
 if PLATFORM_WIN32
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
diff -up gtk-sharp-2.10.3/parser/Makefile.in.old gtk-sharp-2.10.3/parser/Makefile.in
--- gtk-sharp-2.10.3/parser/Makefile.in.old	2008-03-04 22:56:24.000000000 +0100
+++ gtk-sharp-2.10.3/parser/Makefile.in	2008-03-04 22:56:52.000000000 +0100
@@ -209,7 +209,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
 pkgconfigdir = $(libdir)/pkgconfig
 assembly_DATA = gapi-fixup.exe gapi-parser.exe
 pkgconfig_DATA = gapi-2.0.pc
diff -up gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in.old gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in
--- gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in.old	2008-03-04 19:29:17.000000000 +0100
+++ gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in	2008-03-04 19:29:48.000000000 +0100
@@ -194,7 +194,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
-references = $(addprefix /r:, $(assemblies)) @MONO_CAIRO_LIBS@
+references = $(addprefix /r:, $(assemblies)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 TARGETS = GtkDemo.exe
 DEBUGS = $(addsuffix .mdb, $(TARGETS)) 
 CLEANFILES = $(TARGETS) $(DEBUGS)
diff -up gtk-sharp-2.10.3/pango/Makefile.in.old gtk-sharp-2.10.3/pango/Makefile.in
--- gtk-sharp-2.10.3/pango/Makefile.in.old	2008-03-03 14:14:07.000000000 +0100
+++ gtk-sharp-2.10.3/pango/Makefile.in	2008-03-03 14:19:10.000000000 +0100
@@ -282,7 +282,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE@GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE@GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/generator/Makefile.in.old gtk-sharp-2.10.3/generator/Makefile.in
--- gtk-sharp-2.10.3/generator/Makefile.in.old	2008-03-04 22:57:56.000000000 +0100
+++ gtk-sharp-2.10.3/generator/Makefile.in	2008-03-04 22:58:16.000000000 +0100
@@ -205,7 +205,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
 assembly_DATA = gapi_codegen.exe
 bin_SCRIPTS = gapi2-codegen
 CLEANFILES = gapi_codegen.exe
diff -up gtk-sharp-2.10.3/glade/Makefile.in.old gtk-sharp-2.10.3/glade/Makefile.in
--- gtk-sharp-2.10.3/glade/Makefile.in.old	2008-03-04 19:26:56.000000000 +0100
+++ gtk-sharp-2.10.3/glade/Makefile.in	2008-03-04 19:27:33.000000000 +0100
@@ -255,7 +255,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE@GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE@GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/gtk/Makefile.in.old gtk-sharp-2.10.3/gtk/Makefile.in
--- gtk-sharp-2.10.3/gtk/Makefile.in.old	2008-03-04 19:28:23.000000000 +0100
+++ gtk-sharp-2.10.3/gtk/Makefile.in	2008-03-04 19:28:55.000000000 +0100
@@ -365,7 +365,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE@GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE@GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/atk/Makefile.in.old gtk-sharp-2.10.3/atk/Makefile.in
--- gtk-sharp-2.10.3/atk/Makefile.in.old	2008-03-04 19:24:11.000000000 +0100
+++ gtk-sharp-2.10.3/atk/Makefile.in	2008-03-04 19:25:47.000000000 +0100
@@ -230,7 +230,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE@GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE@GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-am