diff --git a/ChangeLog b/ChangeLog
index 3ca2bd38f..06af10836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-06  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in: update to use mdoc.
+	* doc/Makefile.am: update to use mdoc.
+	* doc/gtk-sharp-docs.source: add node element to conform to new
+	monodoc layout model.
+
 2009-01-05  Andrés G. Aragoneses  <aaragoneses@novell.com>
 
 	* GType.cs: 
diff --git a/configure.in.in b/configure.in.in
index 46441db9d..327f1d5c8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -196,17 +196,15 @@ PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=y
 AC_SUBST(GLADE_CFLAGS)
 AC_SUBST(GLADE_LIBS)
 
-AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
-AC_PATH_PROG(MONODOCER, monodocer, no)
-if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
+AC_PATH_PROG(MDOC, mdoc, no)
+if test "x$MDOC" = "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)
+AC_SUBST(MDOC)
 
 AM_CONDITIONAL(ENABLE_MONO_CAIRO, test "x$enable_mono_cairo" = "xyes")
 AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes")
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b8f9696a7..c4be65eb9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,23 +1,21 @@
-ASSEMBLIES = 				\
-	glib-sharp.dll			\
-	pango-sharp.dll			\
-	atk-sharp.dll			\
-	gdk-sharp.dll			\
-	gtk-sharp.dll			\
-	glade-sharp.dll			\
-	gnome-vfs-sharp.dll		\
-	art-sharp.dll			\
-	gnome-sharp.dll			\
-	gconf-sharp.dll			\
-	gconf-sharp-peditors.dll	\
-	gtkhtml-sharp.dll		\
-	rsvg-sharp.dll			\
-	vte-sharp.dll			\
-	gtk-dotnet.dll
+ASSEMBLIES = 					\
+	lib/glib-sharp.dll			\
+	lib/pango-sharp.dll			\
+	lib/atk-sharp.dll			\
+	lib/gdk-sharp.dll			\
+	lib/gtk-sharp.dll			\
+	lib/glade-sharp.dll			\
+	lib/gnome-vfs-sharp.dll			\
+	lib/art-sharp.dll			\
+	lib/gnome-sharp.dll			\
+	lib/gconf-sharp.dll			\
+	lib/gconf-sharp-peditors.dll		\
+	lib/gtkhtml-sharp.dll			\
+	lib/rsvg2-sharp.dll			\
+	lib/vte-sharp.dll			\
+	lib/gtk-dotnet.dll
 
-UPDATE_ASSEMBLIES = $(addprefix -assembly:lib/, $(ASSEMBLIES))
-
-UPDATER = $(MONODOCER) -path:en -pretty $(UPDATE_ASSEMBLIES)
+UPDATER = $(MDOC) update --out=en -pretty --fno-assembly-versions --since="Gtk# 2.14" $(ASSEMBLIES)
 
 if ENABLE_MONODOC
 SOURCESDIR=$(prefix)/lib/monodoc/sources
@@ -33,7 +31,7 @@ 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
-	$(MDASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
+	$(MDOC) assemble -o gtk-sharp-docs $(srcdir)/en
 
 get-assemblies:
 	echo "assumes gnome-sharp and gtk-sharp checkouts in same parent"
@@ -44,12 +42,14 @@ get-assemblies:
 	cp $(top_builddir)/../gnome-sharp/*/*.dll.config lib
 	cp $(top_builddir)/../gnome-sharp/gconf/*/*.dll lib
 	cp $(top_builddir)/../gnome-sharp/gconf/*/*.dll.config lib
+	cp $(top_builddir)/../gnome-desktop-sharp/*/*.dll lib
+	cp $(top_builddir)/../gnome-desktop-sharp/*/*.dll.config lib
 
 update: get-assemblies
-	$(UPDATER)
+	$(MDOC) update --out=en --fno-assembly-versions --since="Gtk# 2.14" $(ASSEMBLIES)
 
 update-delete: get-assemblies
-	$(UPDATER) --delete
+	$(MDOC) update --out=en --fno-assembly-versions --delete --since="Gtk# 2.14" $(ASSEMBLIES)
 
 CLEANFILES = gtk-sharp-docs.zip gtk-sharp-docs.tree lib
 
diff --git a/doc/gtk-sharp-docs.source b/doc/gtk-sharp-docs.source
index 99c5a5df0..e18a1614d 100644
--- a/doc/gtk-sharp-docs.source
+++ b/doc/gtk-sharp-docs.source
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
 <monodoc>
+  <node label="Gnome Libraries" name="classlib-gnome" parent="libraries" />
   <source provider="ecma" basefile="gtk-sharp-docs" path="classlib-gnome"/>
 </monodoc>