diff --git a/build.py b/build.py
index 5c20934..a04a5c1 100644
--- a/build.py
+++ b/build.py
@@ -57,7 +57,7 @@
 
 def write_main(zip, date):
     name = "__main__.py"
-    data = "import newlang.main\nnewlang.main.wait_main()"
+    data = "import newlang.main\nnewlang.main.wait_main(None)"
     write_zip_entry(zip, name, data, date)
 
 
diff --git a/src/newlang/__main__.py b/src/newlang/__main__.py
index cf1db8a..1b95f7f 100755
--- a/src/newlang/__main__.py
+++ b/src/newlang/__main__.py
@@ -4,4 +4,4 @@
 
 import newlang.main
 
-newlang.main.wait_main()
+newlang.main.wait_main("python3 -m newlang")
diff --git a/src/newlang/main.py b/src/newlang/main.py
index 3b57a52..23d77ab 100644
--- a/src/newlang/main.py
+++ b/src/newlang/main.py
@@ -30,14 +30,13 @@
     return 0
 
 
-def main():
+def main(exe_name):
     args = sys.argv
     log_level = os.getenv("NEWLANG_LOG_LEVEL")
-    exe = "NewLang"
-    if len(args) == 1:
-        exe = args[0]
+    if exe_name is None:
+        exe_name = args[0]
     if len(args) != 2:
-        print("Usage: %s FILENAME" % (exe))
+        print("Usage: %s FILENAME" % (exe_name))
         return 1
     return run_file(args[1], log_level)
 
@@ -46,9 +45,9 @@
     input("Unexpected exit. Press any key to continue.")
 
 
-def wait_main():
+def wait_main(exe_name):
     port.atexit_register_one(unexpected_exit)
-    code = main()
+    code = main(exe_name)
     port.atexit_unregister()
     input("Exited with code %s. Press any key to continue." % (code))
     sys.exit(code)