diff --git a/.hgignore b/.hgignore
index 9ec9a470..89f50aa0 100644
--- a/.hgignore
+++ b/.hgignore
@@ -40,12 +40,5 @@ api/gtk.xml
 moo/moopython/pygtk/moo-generated.defs
 moo/moolua/moo-lua-api.cpp
 moo/moolua/gtk-lua-api.cpp
-doc/help/*
-doc/man-medit.t2t
-doc/medit.1
-doc/script-lua.docbook
-doc/script-lua-gtk.docbook
-doc/script-python.docbook
-doc/lgpl.no-fancy-chars
-doc/medit-defines.ent
-doc/moo-help-sections.h
+doc/help/
+doc/built/
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9604f6da..579f14d9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,9 +2,10 @@ BUILT_SOURCES =
 
 if MOO_DEV_MODE
 
-$(srcdir)/medit-defines.ent: medit-defines.ent.in $(top_builddir)/config.status
+$(srcdir)/built/medit-defines.ent: medit-defines.ent.in $(top_builddir)/config.status
 	$(AM_V_GEN)cd $(top_builddir) && ./config.status --silent --file=doc/medit-defines.ent
-	$(AM_V_at)$(MOO_MV_TO_SRCDIR) medit-defines.ent $(srcdir)/medit-defines.ent
+	$(AM_V_at)$(MKDIR_P) $(srcdir)/built
+	$(AM_V_at)mv medit-defines.ent $(srcdir)/built/
 
 gendocbook_files =				\
 	$(top_srcdir)/api/gendocbook.py		\
@@ -12,49 +13,49 @@ gendocbook_files =				\
 	$(top_srcdir)/api/mpi/module.py		\
 	$(top_srcdir)/api/mpi/docbookwriter.py
 
-$(srcdir)/script-python.docbook: $(gendocbook_files) script-python.tmpl.docbook $(top_srcdir)/api/moo.xml
+$(srcdir)/built/script-python.docbook: $(gendocbook_files) script-python.tmpl.docbook $(top_srcdir)/api/moo.xml
 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/api/gendocbook.py \
 		--python --template $(srcdir)/script-python.tmpl.docbook \
 		$(top_srcdir)/api/moo.xml > script-python.docbook.tmp && \
-		mv script-python.docbook.tmp $(srcdir)/script-python.docbook
+		mv script-python.docbook.tmp $(srcdir)/built/script-python.docbook
 
-$(srcdir)/script-lua.docbook: $(gendocbook_files) script-lua.tmpl.docbook $(top_srcdir)/api/moo.xml
+$(srcdir)/built/script-lua.docbook: $(gendocbook_files) script-lua.tmpl.docbook $(top_srcdir)/api/moo.xml
 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/api/gendocbook.py \
 		--lua --template $(srcdir)/script-lua.tmpl.docbook \
 		$(top_srcdir)/api/moo.xml > script-lua.docbook.tmp && \
-		mv script-lua.docbook.tmp $(srcdir)/script-lua.docbook
+		mv script-lua.docbook.tmp $(srcdir)/built/script-lua.docbook
 
-$(srcdir)/script-lua-gtk.docbook: $(gendocbook_files) script-lua-gtk.tmpl.docbook $(top_srcdir)/api/gtk.xml
+$(srcdir)/built/script-lua-gtk.docbook: $(gendocbook_files) script-lua-gtk.tmpl.docbook $(top_srcdir)/api/gtk.xml
 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/api/gendocbook.py \
 		--lua --template $(srcdir)/script-lua-gtk.tmpl.docbook \
 		$(top_srcdir)/api/gtk.xml > script-lua-gtk.docbook.tmp && \
-		mv script-lua-gtk.docbook.tmp $(srcdir)/script-lua-gtk.docbook
+		mv script-lua-gtk.docbook.tmp $(srcdir)/built/script-lua-gtk.docbook
 
-$(srcdir)/help/script-python.html: script-python.docbook medit-defines.ent script.xsl
+$(srcdir)/help/script-python.html: built/script-python.docbook built/medit-defines.ent script.xsl
 	$(AM_V_at)$(MKDIR_P) $(srcdir)/help/
 	$(AM_V_GEN)xsltproc --output script-python.html.tmp \
-		$(srcdir)/script.xsl $(srcdir)/script-python.docbook \
+		$(srcdir)/script.xsl $(srcdir)/built/script-python.docbook \
 		&& mv script-python.html.tmp $(srcdir)/help/script-python.html
 
-$(srcdir)/help/script-lua.html: script-lua.docbook medit-defines.ent script.xsl
+$(srcdir)/help/script-lua.html: built/script-lua.docbook built/medit-defines.ent script.xsl
 	$(AM_V_at)$(MKDIR_P) $(srcdir)/help/
 	$(AM_V_GEN)xsltproc --output script-lua.html.tmp \
-		$(srcdir)/script.xsl $(srcdir)/script-lua.docbook \
+		$(srcdir)/script.xsl $(srcdir)/built/script-lua.docbook \
 		&& mv script-lua.html.tmp $(srcdir)/help/script-lua.html
 
-$(srcdir)/help/script-lua-gtk.html: script-lua-gtk.docbook medit-defines.ent script.xsl
+$(srcdir)/help/script-lua-gtk.html: built/script-lua-gtk.docbook built/medit-defines.ent script.xsl
 	$(AM_V_at)$(MKDIR_P) $(srcdir)/help/
 	$(AM_V_GEN)xsltproc --output script-lua-gtk.html.tmp \
-		$(srcdir)/script.xsl $(srcdir)/script-lua-gtk.docbook \
+		$(srcdir)/script.xsl $(srcdir)/built/script-lua-gtk.docbook \
 		&& mv script-lua-gtk.html.tmp $(srcdir)/help/script-lua-gtk.html
 
 $(srcdir)/help/medit.css: medit.css
 	$(AM_V_at)$(MKDIR_P) $(srcdir)/help/
 	$(AM_V_GEN)cp $(srcdir)/medit.css $(srcdir)/help/
 
-$(srcdir)/lgpl.no-fancy-chars: $(top_srcdir)/COPYING
+$(srcdir)/built/lgpl.no-fancy-chars: $(top_srcdir)/COPYING
 	tr -d '\014' < $(top_srcdir)/COPYING > lgpl.no-fancy-chars.tmp && \
-		 mv lgpl.no-fancy-chars.tmp $(srcdir)/lgpl.no-fancy-chars
+		 mv lgpl.no-fancy-chars.tmp $(srcdir)/built/lgpl.no-fancy-chars
 
 docbook_files =				\
 	medit.docbook			\
@@ -65,8 +66,8 @@ docbook_files =				\
 
 docbook_sources =			\
 	$(docbook_files)		\
-	lgpl.no-fancy-chars		\
-	medit-defines.ent
+	built/lgpl.no-fancy-chars	\
+	built/medit-defines.ent
 
 $(srcdir)/help/index.html: $(docbook_sources) medit.xsl medit-common.xsl
 	$(AM_V_GEN)cd $(srcdir) && xsltproc --xinclude medit.xsl medit.docbook
@@ -83,7 +84,8 @@ toc.xml: $(docbook_sources)
 
 moo-help-sections.h.stamp: $(docbook_files) toc.xml genhelpsectionsh.py
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/genhelpsectionsh.py --toc=toc.xml --srcdir=$(srcdir) $(docbook_files) > moo-help-sections.h.tmp
-	$(AM_V_at)cmp -s moo-help-sections.h.tmp $(srcdir)/moo-help-sections.h || mv moo-help-sections.h.tmp $(srcdir)/moo-help-sections.h
+	$(AM_V_at)cmp -s moo-help-sections.h.tmp $(srcdir)/built/moo-help-sections.h || \
+		mv moo-help-sections.h.tmp $(srcdir)/built/moo-help-sections.h
 	$(AM_V_at)rm -f moo-help-sections.h.tmp
 	$(AM_V_at)echo stamp > moo-help-sections.h.stamp
 
@@ -102,21 +104,21 @@ doc:						\
 	$(srcdir)/help/script-lua-gtk.html	\
 	$(srcdir)/help/script-python.html	\
 	$(srcdir)/help/medit.css		\
-	$(srcdir)/medit.1			\
+	$(srcdir)/built/medit.1			\
 	$(dest_png_files)			\
 	moo-help-sections.h.stamp
 
-man-medit.t2t: man-medit.t2t.in $(top_builddir)/config.status
+$(srcdir)/built/man-medit.t2t: man-medit.t2t.in $(top_builddir)/config.status
 	$(AM_V_GEN)cd $(top_builddir) && ./config.status --silent --file=doc/man-medit.t2t
-	$(AM_V_at)$(MOO_MV_TO_SRCDIR) man-medit.t2t $(srcdir)/man-medit.t2t
+	$(AM_V_at)mv man-medit.t2t $(srcdir)/built/man-medit.t2t
 
-medit.1: man-medit.t2t
-	$(AM_V_GEN)txt2tags --target=man --outfile=- $(srcdir)/man-medit.t2t | grep -v "cmdline: txt2tags" \
-		> medit.1.tmp && mv medit.1.tmp $(srcdir)/medit.1
+$(srcdir)/built/medit.1: built/man-medit.t2t
+	$(AM_V_GEN)txt2tags --target=man --outfile=- $(srcdir)/built/man-medit.t2t | grep -v "cmdline: txt2tags" \
+		> medit.1.tmp && mv medit.1.tmp $(srcdir)/built/medit.1
 
 endif
 
-EXTRA_DIST = help moo-help-sections.h medit.1
+EXTRA_DIST = help built/moo-help-sections.h built/medit.1
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(MOO_HELP_DIR)/img
@@ -127,5 +129,5 @@ uninstall-local:
 	rm -f $(DESTDIR)$(MOO_HELP_DIR)/*.html $(DESTDIR)$(MOO_HELP_DIR)/*.css $(DESTDIR)$(MOO_HELP_DIR)/img/*.png
 
 if MOO_OS_UNIX
-dist_man_MANS = medit.1
+dist_man_MANS = built/medit.1
 endif MOO_OS_UNIX
diff --git a/doc/help-sections.h b/doc/help-sections.h
deleted file mode 100644
index d209a2f4..00000000
--- a/doc/help-sections.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef MOO_HELP_SECTIONS_H
-#define MOO_HELP_SECTIONS_H
-
-#define HELP_SECTION_APP_LICENSE "ch04.html"
-#define HELP_SECTION_DIALOG_FIND "index.html"
-#define HELP_SECTION_DIALOG_FIND_FILE "index.html"
-#define HELP_SECTION_DIALOG_FIND_IN_FILES "index.html"
-#define HELP_SECTION_DIALOG_REPLACE "index.html"
-#define HELP_SECTION_FILE_SELECTOR "index.html"
-#define HELP_SECTION_PREFS_ACCELS "index.html"
-#define HELP_SECTION_PREFS_DIALOG "ch01s01.html"
-#define HELP_SECTION_PREFS_FILE_SELECTOR "ch01s04.html"
-#define HELP_SECTION_PREFS_FILTERS "ch01s03.html"
-#define HELP_SECTION_PREFS_LANGS "ch01s02.html"
-#define HELP_SECTION_PREFS_PLUGINS "index.html"
-#define HELP_SECTION_USER_TOOLS "ch03.html"
-
-#endif /* MOO_HELP_SECTIONS_H */
diff --git a/doc/license.docbook b/doc/license.docbook
index 07d3c58a..923090db 100644
--- a/doc/license.docbook
+++ b/doc/license.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE chapter [
-<!ENTITY % medit-defines SYSTEM "medit-defines.ent">
+<!ENTITY % medit-defines SYSTEM "built/medit-defines.ent">
 %medit-defines;
 ]>
 <chapter id="chapter-license" moo.helpsection="APP_LICENSE">
@@ -26,7 +26,7 @@ in &medit;, can be found in this section.
 <sect1 id="section-license-lgpl">
 <title>GNU Lesser General Public License</title>
 <literallayout>
-<xi:include href="lgpl.no-fancy-chars" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="built/lgpl.no-fancy-chars" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </literallayout>
 </sect1>
 
diff --git a/doc/medit.docbook b/doc/medit.docbook
index 661344ea..b9e8f56e 100644
--- a/doc/medit.docbook
+++ b/doc/medit.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!-- -%- indent-width:1 -%- -->
 <!DOCTYPE book [
-<!ENTITY % medit-defines SYSTEM "medit-defines.ent">
+<!ENTITY % medit-defines SYSTEM "built/medit-defines.ent">
 %medit-defines;
 ]>
 <book id="medit-manual">
diff --git a/doc/prefs.docbook b/doc/prefs.docbook
index ba8d8a3a..47346366 100644
--- a/doc/prefs.docbook
+++ b/doc/prefs.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0"?><!-- -%- indent-width:2 -%- -->
 <!DOCTYPE chapter [
-<!ENTITY % medit-defines SYSTEM "medit-defines.ent">
+<!ENTITY % medit-defines SYSTEM "built/medit-defines.ent">
 %medit-defines;
 ]>
 <chapter id="chapter-prefs">
diff --git a/doc/regex.docbook b/doc/regex.docbook
index 4240cab5..f259d600 100644
--- a/doc/regex.docbook
+++ b/doc/regex.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE chapter [
-<!ENTITY % medit-defines SYSTEM "medit-defines.ent">
+<!ENTITY % medit-defines SYSTEM "built/medit-defines.ent">
 %medit-defines;
 ]>
 <chapter id="chapter-regex">
diff --git a/doc/user-tools.docbook b/doc/user-tools.docbook
index 28033992..fe8e10a9 100644
--- a/doc/user-tools.docbook
+++ b/doc/user-tools.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0"?><!-- -%- indent-width:2 -%- -->
 <!DOCTYPE chapter [
-<!ENTITY % medit-defines SYSTEM "medit-defines.ent">
+<!ENTITY % medit-defines SYSTEM "built/medit-defines.ent">
 %medit-defines;
 ]>
 <chapter id="chapter-user-tools" moo.helpsection="USER_TOOLS">
diff --git a/moo/Makefile.am b/moo/Makefile.am
index a62a71f6..53182d79 100644
--- a/moo/Makefile.am
+++ b/moo/Makefile.am
@@ -4,7 +4,7 @@ CLEANFILES =
 bin_PROGRAMS =
 noinst_LIBRARIES =
 
-AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/doc -Imooutils/glade
+AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/doc/built -Imooutils/glade
 AM_CFLAGS = $(MOO_CFLAGS)
 AM_CXXFLAGS = $(MOO_CXXFLAGS)