diff --git a/Makefile-lisp-scripting b/Makefile-lisp-scripting
index 6dabae2d5de28120c19d751fe5cdf44222644423..ac57841f0633b002f64aafe128f64466b5ffd3f4 100644
--- a/Makefile-lisp-scripting
+++ b/Makefile-lisp-scripting
@@ -1,19 +1,19 @@
 # -*- Makefile -*- This minimal Makefile delegates most work to the asdf-tools script
 #
 # End-Users, all you need to do is:
-#   make
+#   make -f Makefile-lisp-scripting
 #
 # Vendors, you may want to test your implementation with:
-#   make test l=sbcl
+#   make -f Makefile-lisp-scripting test l=sbcl
 # BUT you first need have installed the development-time external dependencies of ASDF;
 # this will be done automatically if you are using quicklisp;
 # you can do it manually with your favorite tools (e.g. clbuild or git);
 # or you can do it using `git submodule update` which is also available as:
-#   make ext
+#   make -f Makefile-lisp-scripting ext
 # To undo the `git submodule update` you can use: `make noext`
 #
 # Other targets are for maintainer use only. If you want a list of all of the targets, use
-#   make help
+#   make -f Makefile-lisp-scripting help
 #
 ### Default fall back rule: delegate to asdf-tools.
 # Note that the l= L= etc. are the only way I (Faré) have found to
@@ -34,18 +34,18 @@
 # you may have to use positional parameters instead (unless you use env as below), as in
 #   ./tools/asdf-tools bump 3.2.1
 # instead of
-#   make bump v=3.2.1
+#   make -f Makefile-lisp-scripting bump v=3.2.1
 # or
-#   ./make.sh v=3.2.1 bump
+#   ./make-asdf.sh v=3.2.1 bump
 # or
 #   ./tools/asdf-tools env v=3.2.1 bump
 # or
 #   v=3.2.1 ./tools/asdf-tools bump
 
 ifeq ($(OS),Windows_NT)
-  MAKE_SCRIPT := cmd /c make.bat
+  MAKE_SCRIPT := cmd /c make-asdf.bat
 else
-  MAKE_SCRIPT := ./make.sh
+  MAKE_SCRIPT := ./make-asdf.sh
 endif
 
 
@@ -57,7 +57,8 @@ build/asdf-tools build/asdf-tools.exe: build_asdf_tools
 
 .PHONY: force all ext noext driver_files defsystem_files build_asdf build_asdf_tools
 
-# The text below was automaticaly generated by `make --silent makefile-targets`
+# The text below was automaticaly generated by
+#    make -f Makefile-lisp-scripting --silent makefile-targets
 # then manually inserted here to provide for completion:
 .PHONY: archive build-asdf build-asdf-tools bump bump-version check-all-results check-all-scripts-results check-all-upgrade-results clean debian-package doc ext-clear ext-init ext-reset ext-update extract extract-all-tagged-asdf extract-tagged-asdf fix-local-git-tags fix-remote-git-tags git-all-committed-p help install install-asdf link-archive load make-and-publish-archive make-archive makefile-targets merge-master-into-release publish-archive publish-debian-package push re show-commands t test test-all test-all-clean-load test-all-no-stop test-all-no-upgrade test-all-no-upgrade-no-stop test-all-scripts test-all-scripts-no-stop test-all-upgrade test-all-upgrade-no-stop test-ascii test-basic test-clean-load test-load-systems test-scripts test-upgrade u wc website
 
diff --git a/make.bat b/make-asdf.bat
similarity index 97%
rename from make.bat
rename to make-asdf.bat
index 820fbc4e81b754372469937a4774076afc30fbf6..8655e52f1cad4482641bf21be17c5890f77032c9 100644
--- a/make.bat
+++ b/make-asdf.bat
@@ -1,5 +1,5 @@
 @echo off
-:: Usage: ./make.sh [keyword=argument ...] <command>
+:: Usage: ./make-asdf.bat [keyword=argument ...] <command>
 :: See the Makefile for the list of acceptable keyword arguments
 
 set here=%~dp0
diff --git a/make.sh b/make-asdf.sh
similarity index 97%
rename from make.sh
rename to make-asdf.sh
index 0e70aa3275958ad5063ec8253bd9a775bd7e52ca..dbb6ab439f34aaab8469b6e4b10157a578288e3f 100755
--- a/make.sh
+++ b/make-asdf.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Usage: ./make.sh [keyword=argument ...] <command>
+# Usage: ./make-asdf.sh [keyword=argument ...] <command>
 # See the Makefile for the list of acceptable keyword arguments
 
 here="$(dirname $0)"
diff --git a/test/test-sysdef-asdf.script b/test/test-sysdef-asdf.script
index eae9d5f0965ebbab85987d2c7e31cbfe7b663c66..14d396ecc283c2a1cde349d3ab3ec94fbed897c0 100644
--- a/test/test-sysdef-asdf.script
+++ b/test/test-sysdef-asdf.script
@@ -56,13 +56,13 @@
                        (system-source-file (find-system :asdf)))
 
 
-;;; disabling this test on windows since it relies on running make.bat, which
+;;; disabling this test on windows since it relies on running make-asdf.bat, which
 ;;; does not work for me under cygwin. - rpg 2016-03-20
 
 (defun search-makefile (target)
   (with-open-file (str (merge-pathnames (make-pathname :name "Makefile" :type nil)
                                         *asdf-directory* ))
-    (let ((line                   
+    (let ((line
            (loop for x = (read-line str)
                  when (search target x)
                  return (subseq x (length target))