diff --git a/ChangeLog b/ChangeLog
index d8c75cab8..ebde1c587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-28  Ben Maurer  <bmaurer@ximian.com>
 
+	* configure.in.in: Enable doc building without mono-tools being
+	built.
+
 	* gtk/NodeSelection.cs: helper api
 
 2005-08-27  Peter Williams  <peter@newton.cx>
diff --git a/configure.in.in b/configure.in.in
index 422dad31b..78d4606f3 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -221,14 +221,14 @@ else
 enable_vte=no
 fi
 
-MONODOC_REQUIRED_VERSION=1.0.6.99
-PKG_CHECK_MODULES(MONODOC_DEPS, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no)
-AC_PATH_PROG(MONODOC, monodoc, no)
+AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
 AC_PATH_PROG(MONODOCER, monodocer, no)
-if test "x$MONODOCER" = "xno" -o "x$MONODOC" = "xno"; then
+if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
   enable_monodoc=no
+else
+  enable_monodoc=yes
 fi
-AC_SUBST(MONODOC)
+AC_SUBST(MDASSEMBLER)
 AC_SUBST(MONODOCER)
 
 AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f93d964e5..2afa30bf4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-28  Ben Maurer  <bmaurer@ximian.com>
 
+	* Makefile.am (gtk-sharp-docs.zip gtk-sharp-docs.tree): Use
+	mdassembler.
+
 	* en/Gtk/NodeSelection.xml: Docs
 
 2005-08-14  John Luke  <john.luke@gmail.com>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index acef2a976..905ea5ea2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-ASSEMBLER = $(MONODOC) --assemble
-
 ASSEMBLIES = 				\
 	glib-sharp.dll			\
 	pango-sharp.dll			\
@@ -28,7 +26,7 @@ endif
 assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
 
 gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
-	$(ASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
+	$(MDASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
 
 get-assemblies:
 	mkdir -p lib