diff --git a/Makefile b/Makefile
index 04635416f..a1902a195 100644
--- a/Makefile
+++ b/Makefile
@@ -28,41 +28,20 @@ help helpall::
 	$(info make all            - ditto)
 	$(info make compile        - build Org ELisp files)
 	$(info make autoloads      - create org-install.el to load Org in-place)
-	$(info make check          - build Org ELisp files and run test suite)
+	$(info make test           - build Org ELisp files and run test suite)
 helpall::
-	$(info make test           - ditto)
+	$(info make test-dirty     - check without building first)
 	$(info make compile-dirty  - build only stale Org ELisp files)
 	$(info make compile-single - build using one Emacs process per file)
-	$(info make compile-source - ditto, but immediately remove byte-compiled file )
-	$(info make test-dirty     - check without building first)
 	$(info )
 	$(info Compatibility)
 	$(info =============)
 	$(info make oldorg         - what the old make did: compile autoloads info)
 	$(info )
-	$(info Convenience)
-	$(info ===========)
-	$(info make up0            - pull from upstream)
-	$(info make up1            - pull from upstream, build and check)
-	$(info make up2            - pull from upstream, build, check and install)
-	$(info make update         - pull from upstream and build)
-	$(info make update2        - pull from upstream, build and install)
-	$(info make uncompiled     - combine cleanlisp and autoloads)
-	$(info make local.mk       - create new local.mk as template for adaptation)
-	$(info )
 	$(info Cleaning)
 	$(info ========)
 	$(info make clean          - remove built Org ELisp files and documentation)
 	$(info make cleanall       - remove everything that can be built and all remnants)
-	$(info make cleandirs      - clean in etc/, lisp/ and doc/)
-	$(info make cleancontrib   - remove remnants in contrib/)
-	$(info make cleantesting   - remove remnants in testing/)
-	$(info make cleanutils     - remove remnants in UTILITIES/)
-	$(info make cleandoc       - remove built documentation)
-	$(info make cleandocs      - ditto)
-	$(info make cleanlisp      - remove built Org ELisp files)
-	$(info make cleanelc       - ditto)
-	$(info make cleantest      - remove test directory)
 	$(info make clean-install  - remove previous Org installation)
 	$(info )
 	$(info Configuration Check)
@@ -74,7 +53,6 @@ helpall::
 	$(info make config-exe     - check executables configuration)
 	$(info make config-cmd     - check command configuration)
 	$(info make config-all     - check all configuration)
-	$(info make config-eol     - check all configuration, mark end-of-line)
 	$(info )
 	$(info Documentation)
 	$(info =============)
@@ -98,6 +76,16 @@ helpall::
 	$(info make install-etc    - build and install files in /etc)
 	$(info make install-lisp   - build and install Org Elisp files)
 	$(info make install-info   - build and install Info documentation)
+	$(info )
+	$(info Convenience)
+	$(info ===========)
+	$(info make up0            - pull from upstream)
+	$(info make up1            - pull from upstream, build and check)
+	$(info make up2            - pull from upstream, build, check and install)
+	$(info make update         - pull from upstream and build)
+	$(info make update2        - pull from upstream, build and install)
+	$(info make uncompiled     - combine cleanlisp and autoloads)
+	$(info make local.mk       - create new local.mk as template for adaptation)
 help helpall::
 	@echo ""