diff --git a/Documentation/Books/Makefile b/Documentation/Books/Makefile
index 6823631bf6..ff80ed987c 100644
--- a/Documentation/Books/Makefile
+++ b/Documentation/Books/Makefile
@@ -55,6 +55,14 @@ check-summary:
 		exit 1; \
 	fi
 
+book-check-leftover-docublocks:
+	@if test "`grep -r \"@startDocuBlock\" --include \"*.html\" books/$(NAME) | wc -l`" -ne 0; then \
+	  echo ; \
+	  echo "@startDocuBlock markers still found in generated output files:"; \
+	  grep -rl "@startDocuBlock" --include "*.html" books/$(NAME) | sed -e "s/^/- /g"; \
+	  exit 1; \
+	fi
+
 clean: clean-md-files clean-books
 	rm -f allComments.txt
 
@@ -69,9 +77,10 @@ build-books: build-books-keep-md # not now: check-docublocks
 	awk '{print "ln -s index.html " $$1 "README.html"}' |\
 	bash
 
-build-books-keep-md: md-files
+build-books-keep-md: md-files # not now: check-summary
 	@test -d books || mkdir books
 	make build-book NAME=Users
+	make book-check-leftover-docublocks NAME=Users
 
 build-book:
 	@test -d books/$(NAME) || mkdir books/$(NAME)
@@ -83,10 +92,4 @@ build-book:
 	cp Users/cookbookLogo.png books/Users/
 	cp Users/googlegroupsIcon.png books/Users/
 	python deprecated.py
-	@if test "`grep -r \"@startDocuBlock\" --include \"*.html\" books/Users | wc -l`" -ne 0; then \
-	  echo ; \
-	  echo "@startDocuBlock markers still found in generated output files:"; \
-	  grep -rl "@startDocuBlock" --include "*.html" books/Users | sed -e "s/^/- /g"; \
-	  exit 1; \
-	fi