diff --git a/Dothem b/Dothem
index 9425b68c7d..c503a3767d 100755
--- a/Dothem
+++ b/Dothem
@@ -91,14 +91,13 @@ do
 			;;
 		esac &&
 
-		Meta/Make $M -- $J all &&
 		Meta/Make $M -- $J $dotest &&
 		case "$branch" in
 		jch)
-			Meta/Make $M -- doc install-doc
+			test -n "$nodoc" || Meta/Make $M -- doc install-doc
 			;;
 		master | maint | next )
-			test -z "$nodoc" || Meta/Make $M -- doc
+			test -n "$nodoc" || Meta/Make $M -- doc
 			;;
 		*)
 			: ;;