diff --git a/l3build-aux.lua b/l3build-aux.lua
index 60193795..f081054d 100644
--- a/l3build-aux.lua
+++ b/l3build-aux.lua
@@ -58,7 +58,7 @@ function setepoch()
 end
 
 local function getscriptname()
-  if match(arg[0], "l3build(%.lua)$") then
+  if match(arg[0], "l3build$") or match(arg[0], "l3build%.lua$") then
     return lookup("l3build.lua")
   else
     return arg[0]
diff --git a/l3build.lua b/l3build.lua
index 0ddf05d7..e4f4dbf1 100755
--- a/l3build.lua
+++ b/l3build.lua
@@ -79,7 +79,7 @@ build_require("stdmain")
 main = main or stdmain
 
 -- Load configuration file if running as a script
-if match(arg[0], "l3build(%.lua)$") then
+if match(arg[0], "l3build$") or match(arg[0], "l3build%.lua$") then
   -- Look for some configuration details
   if fileexists("build.lua") then
     dofile("build.lua")