diff --git a/Viewer/Makefile b/Viewer/Makefile
index 301f6abc..c5fc3e23 100755
--- a/Viewer/Makefile
+++ b/Viewer/Makefile
@@ -353,8 +353,8 @@ doc/MAKE: Makefile
 		make help ; \
 		echo ; \
 		echo "---" ; \
-		echo "This file was generated by: make doc/MAKE" ; \
-	} | egrep -v "^make\[1\]:" > doc/MAKE
+		echo "This file was generated by: make $@" ; \
+	} | egrep -v "^make\[1\]:" > $@
 
 
 
@@ -397,7 +397,7 @@ all: check doc dev dist deploy
 
 
 .PHONY: doc
-doc: ## Build the documentation
+doc: ## Build documentation
 doc: $(DOC_FILES)
 
 
diff --git a/Viewer/doc/MAKE b/Viewer/doc/MAKE
index 83ef6f07..6a890069 100644
--- a/Viewer/doc/MAKE
+++ b/Viewer/doc/MAKE
@@ -54,7 +54,7 @@ Dependency checking:
 
 Generic targets:
    all:                           Run the full build chain
-   doc:                           Build the documentation
+   doc:                           Build documentation
    dev:                           Build the development environment
    dist:                          Build distributable package
    test-dist:                     Build testing distributable package
diff --git a/Viewer/doc/PROJECT-LAYOUT b/Viewer/doc/PROJECT-LAYOUT
index 7c9ebd05..011f6c00 100755
--- a/Viewer/doc/PROJECT-LAYOUT
+++ b/Viewer/doc/PROJECT-LAYOUT
@@ -37,6 +37,8 @@ Basic project layout:
 		NOTES		- general notes
 		HACKS		- list of hacks around external 
 				  "features" and bugs
+		MAKE		- Makefile doc, the same as printed
+				  by make help (generated by make doc)
 
 	experiments/		- standalone experiments