diff --git a/Documentation/GNUmakefile.postamble b/Documentation/GNUmakefile.postamble
index 7d4756f7d..20f04f517 100644
--- a/Documentation/GNUmakefile.postamble
+++ b/Documentation/GNUmakefile.postamble
@@ -30,7 +30,6 @@
 # the source code.
 after-all::
 	$(MAKE) -C ../Source -f DocMakefile
-	$(MAKE) -C Gui -f GNUmakefile
 
 # Things to do before installing
 # before-install::
diff --git a/Source/DocMakefile b/Source/DocMakefile
index 1ca55b65d..9b697f09d 100644
--- a/Source/DocMakefile
+++ b/Source/DocMakefile
@@ -141,7 +141,16 @@ DOCUMENT_NAME = Gui
 
 Gui_DOC_INSTALL_DIR = Developer
 
-Gui_AGSDOC_FILES = ../Documentation/Gui.gsdoc $(AUTOGSDOC_HEADERS)
+Gui_AGSDOC_FILES = ../Documentation/Gui/Gui.gsdoc \
+	../Documentation/Gui/Introduction.gsdoc \
+	../Documentation/Gui/DefaultsSummary.gsdoc \
+	../Documentation/Gui/LanguageSetup.gsdoc \
+	../Documentation/Gui/NSBundleAdditions.gsdoc \
+	../Documentation/Gui/NSCoderAdditions.gsdoc \
+	../Documentation/Gui/NSMutableAttributedStringAdditions.gsdoc \
+	../Documentation/Gui/NSMutableParagraphStyle.gsdoc \
+	../Documentation/Gui/NSStringAdditions.gsdoc \
+	$(AUTOGSDOC_HEADERS)
 
 #
 # Hack ... using the -DocumentationDirectory flag overrides the value