diff --git a/gendarme/framework/ChangeLog b/gendarme/framework/ChangeLog
index ed6d02709..e8f8cf978 100644
--- a/gendarme/framework/ChangeLog
+++ b/gendarme/framework/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-27  Jonathan Pryor  <jpryor@novell.com>
+
+	* Makefile.am ($(framework_doc_source)): Change the .source file 
+	  contents so that framework docs are placed under the 
+	  'Gendarme Framework' node.
+
 2008-11-28  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* Makefile.am: Use -noshadow on nunit-console2 so the "new" 2.4,
diff --git a/gendarme/framework/Makefile.am b/gendarme/framework/Makefile.am
index 650b18661..7abb5b89b 100644
--- a/gendarme/framework/Makefile.am
+++ b/gendarme/framework/Makefile.am
@@ -119,7 +119,7 @@ $(framework_doc_zip): $(generated_doc)
 $(framework_doc_tree): $(generated_doc)
 	
 $(framework_doc_source):
-	echo -e "<?xml version='1.0'?>\n<monodoc>\n\t<source provider='ecma' basefile='Gendarme.Framework' path='classlib-Gendarme.Framework'/>\n</monodoc>" > $(framework_doc_source) 
+	echo -e "<?xml version='1.0'?>\n<monodoc>\n\t<node label='Gendarme Framework' name='classlib-Gendarme.Framework' parent='libraries' />\n\t<source provider='ecma' basefile='Gendarme.Framework' path='classlib-Gendarme.Framework'/>\n</monodoc>" > $(framework_doc_source) 
 
 clean-local:
 	rm -fr doc/
diff --git a/gendarme/man/ChangeLog b/gendarme/man/ChangeLog
index 2005d7e80..e4f845003 100644
--- a/gendarme/man/ChangeLog
+++ b/gendarme/man/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-27  Jonathan Pryor  <jpryor@novell.com>
+
+	* . (svn:ignore): Ignore generated files.
+	* gendarme.source: Added; Adds the gendarme man page under monodoc's
+	  'Commands and Files/Gendarme' node.
+	* gendarme.config: Added; mdoc-assemble config file to generate
+	  gendarme.tree, gendarme.zip (containing gendarme.1).
+	* Makefile.am: Build and install man pages for monodoc.
+
 2008-11-17  Jesse Jones  <jesjones@mindspring.com>
 
 	* gendarme.1.in: Document config file.
diff --git a/gendarme/man/Makefile.am b/gendarme/man/Makefile.am
index 1da482b83..06878ec86 100644
--- a/gendarme/man/Makefile.am
+++ b/gendarme/man/Makefile.am
@@ -1,3 +1,14 @@
 man_MANS = gendarme.1
-EXTRA_DIST = gendarme.1.in
+EXTRA_DIST = gendarme.1.in gendarme.config gendarme.source
 DISTCLEANFILES = Makefile.in gendarme.1
+CLEANFILES = gendarme.tree gendarme.zip
+
+rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentation_DATA = gendarme.source gendarme.tree gendarme.zip
+
+all: gendarme.tree gendarme.zip
+
+gendarme.zip : gendarme.tree
+gendarme.tree: gendarme.config Makefile
+	mdoc assemble -o gendarme -f man $<
+
diff --git a/gendarme/man/gendarme.config b/gendarme/man/gendarme.config
new file mode 100644
index 000000000..753420f1e
--- /dev/null
+++ b/gendarme/man/gendarme.config
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<manpages>
+  <manpage name="gendarme(1)" page="gendarme.1" />
+</manpages>
+
diff --git a/gendarme/man/gendarme.source b/gendarme/man/gendarme.source
new file mode 100644
index 000000000..b2ec69afe
--- /dev/null
+++ b/gendarme/man/gendarme.source
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<monodoc>
+  <node label="Gendarme" name="gendarme" parent="man"/>
+  <source provider="man" basefile="gendarme" path="gendarme"/>
+</monodoc>
+
diff --git a/gendarme/rules/ChangeLog b/gendarme/rules/ChangeLog
index bc365b35a..834448654 100644
--- a/gendarme/rules/ChangeLog
+++ b/gendarme/rules/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-27  Jonathan Pryor  <jpryor@novell.com>
+
+	* common.make ($(rules_doc_source)): Change the .source file contents 
+	  so that rules are placed under the 'Commands and Files/Gendarme' node.
+
 2009-01-09  Jesse Jones  <jesjones@mindspring.com>
 
 	* Makefike.am: put rules target back in (needed for the new console
diff --git a/gendarme/rules/common.make b/gendarme/rules/common.make
index b8ba71d52..449c00b0e 100644
--- a/gendarme/rules/common.make
+++ b/gendarme/rules/common.make
@@ -69,7 +69,7 @@ $(rules_doc_zip): $(generated_doc)
 $(rules_doc_tree): $(generated_doc)
 	
 $(rules_doc_source):
-	echo -e "<?xml version='1.0'?>\n<monodoc>\n\t<source provider='ecma' basefile='$(prefixed_rules_category)' path='ruleslib-$(prefixed_rules_category)'/>\n</monodoc>" > $(rules_doc_source) 
+	echo -e "<?xml version='1.0'?>\n<monodoc>\n\t<node label='Gendarme' name='gendarme' parent='man'/>\n\t<source provider='ecma' basefile='$(prefixed_rules_category)' path='gendarme'/>\n</monodoc>" > $(rules_doc_source) 
 
 clean-local:
 	rm -fr doc