diff --git a/ChangeLog b/ChangeLog
index 7b26ba0b4..e496e17f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-13  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in : check for mono-cairo.pc.
+	* Makefile.include : use AC_SUBST for cairo ref.
+	* gdk/Gdk.metadata : s/Cairo.Graphics/Cairo.Context.
+
 2005-12-12  Mike Kestner  <mkestner@novell.com>
 
 	* gnomevfs/Gnomevfs.metadata : mark some const strings.
diff --git a/Makefile.include b/Makefile.include
index 02964a53c..1414e4727 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -54,14 +54,12 @@ $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
 	done
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(CAIRO_REFERENCE)
+build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
 
 if PLATFORM_WIN32
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
-CAIRO_REFERENCE=
 else
 GAPI_CDECL_INSERT=
-CAIRO_REFERENCE=/r:Mono.Cairo.dll
 endif
 
 $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
diff --git a/configure.in.in b/configure.in.in
index a20b7bae3..1b2283a46 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -152,6 +152,13 @@ AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(GENERATED_SOURCES)
 
+PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= $MONO_REQUIRED_VERSION, has_mono_cairo=true, has_mono_cairo=false)
+AC_SUBST(MONO_CAIRO_LIBS)
+
+if test "x$has_mono_cairo" = "xfalse" -a "x$API_VERSION" = "x2.8.0.0"; then
+	AC_MSG_ERROR([You need to install Mono.Cairo.dll and its pkgconfig file or set PKG_CONFIG_PATH to find it.])
+fi
+
 GTK_REQUIRED_VERSION=@GTK_REQUIRED_VERSION@
 
 PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GTK_REQUIRED_VERSION)
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index 48dbe29b4..de6aa4247 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -183,6 +183,6 @@
   <attr path="/api/namespace/struct[@cname='GdkRgbCmap']/field[@name='NColors']" name="writeable">false</attr>
   <attr path="/api/namespace/struct[@cname='GdkTimeCoord']/field[@cname='axes']" name="array_len">128</attr>
   <attr path="/api/namespace/struct[@cname='GdkWindowObject']" name="hidden">1</attr>
-  <add-node path="/api"><symbol type="manual" cname="cairo_t" name="Cairo.Graphics"/></add-node>
+  <add-node path="/api"><symbol type="manual" cname="cairo_t" name="Cairo.Context"/></add-node>
 </metadata>