3 files changed, 10 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-aux.lua b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
index 773a17a40e1..60193795a9a 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-aux.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-aux.lua
@@ -27,6 +27,8 @@ local match = string.match
 local pairs = pairs
 local print = print
 
+local lookup = kpse.lookup
+
 --
 -- Auxiliary functions which are used by more than one main function
 --
@@ -57,9 +59,9 @@ end
 
 local function getscriptname()
   if match(arg[0], "l3build(%.lua)$") then
-    return "l3build.lua"
+    return lookup("l3build.lua")
   else
-    return "build.lua"
+    return arg[0]
   end
 end
 
diff --git a/Master/texmf-dist/scripts/l3build/l3build-help.lua b/Master/texmf-dist/scripts/l3build/l3build-help.lua
index 770022f254d..c7050c44210 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-help.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-help.lua
@@ -31,7 +31,11 @@ function version()
 end
 
 function help()
-  print("usage: " .. arg[0] .. " <command> [<options>] [<names>]")
+  local scriptname = "l3build"
+  if not string.match(arg[0], "l3build(%.lua)$") then
+    scriptname = arg[0]
+  end
+  print("usage: " .. scriptname .. " <command> [<options>] [<names>]")
   print("")
   print("The most commonly used l3build commands are:")
   if testfiledir ~= "" then
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index cb8a6d674cb..506740f8a41 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -23,7 +23,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2018-03-08"
+release_date = "2018-03-09"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")