diff --git a/ChangeLog b/ChangeLog
index bf41859a3..56044b291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-07  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in : check for monodoc sources dir and warn if we are
+	configuring for a different prefix.
+	* doc/Makefile.am : add install targets.
+
 2005-09-06  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/NodeStore.cs : fix recursive emit of row_inserted.
diff --git a/configure.in.in b/configure.in.in
index 78d4606f3..f95ab410a 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -225,8 +225,10 @@ AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
 AC_PATH_PROG(MONODOCER, monodocer, no)
 if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
   enable_monodoc=no
+  doc_sources_dir=
 else
   enable_monodoc=yes
+  doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
 fi
 AC_SUBST(MDASSEMBLER)
 AC_SUBST(MONODOCER)
@@ -341,5 +343,9 @@ echo "            corresponding development packages for them, rerun"
 echo "            autogen.sh to include them in the build."
 echo ""
 echo "   * Documentation build enabled: $enable_monodoc "
+if test "x$enable_monodoc" = "xyes" -a "x$doc_sources_dir" != "x$prefix/lib/monodoc/sources"; then
+  echo "      WARNING: The install prefix is different than the monodoc prefix."
+  echo "               Monodoc will not be able to load the documentation."
+fi
 echo "---"
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 905ea5ea2..3d911897d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,6 +23,17 @@ else
 UPDATER = echo "All optional assemblies must be built to use the updater." && exit 1
 endif
 
+if ENABLE_MONODOC
+SOURCESDIR=$(prefix)/lib/monodoc/sources
+TARGETS=gtk-sharp-docs.zip gtk-sharp-docs.tree gtk-sharp-docs.source
+else
+SOURCESDIR=$(datadir)
+TARGETS=
+endif
+
+monodocdir=$(SOURCESDIR)
+monodoc_DATA=$(TARGETS)
+
 assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
 
 gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml