diff --git a/l3build.lua b/l3build.lua
index 1b6fb4eb..67b80d7e 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -857,23 +857,20 @@ end
 
 -- Copy files to the main CTAN release directory
 function copyctan()
-  -- Do all of the copying
-  for _,filetype in pairs(
+  -- Do all of the copying in one go
+  for _,i in ipairs(
       {
         bibfiles,
         demofiles,
         docfiles,
         pdffiles,
+        sourcefiles,
+        textfiles,
         typesetlist
       }
     ) do
-    for _,file in pairs(filetype) do
-      cp(file, docfiledir, ctandir .. "/" .. ctanpkg)
-    end
-  end
-  for _,filetype in pairs({sourcefiles, textfiles}) do
-    for _,file in pairs(filetype) do
-      cp(file, maindir, ctandir .. "/" .. ctanpkg)
+    for _,j in ipairs(i) do
+      cp(j, ".", ctandir .. "/" .. ctanpkg)
     end
   end
 end