diff --git a/Makefile b/Makefile
index 65aade18..5479a051 100644
--- a/Makefile
+++ b/Makefile
@@ -89,8 +89,8 @@ DISTDOCS=COPYING.txt CREDITS.txt README.html
 
 # Due to convoluted reasons, the WADs must directly proceed the game name.
 dist: $(OBJS) COPYING.txt CREDITS.txt README.html
-	VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
-	VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
+	LC_ALL=C VERSION=$(VERSION) scripts/makepkgs freedm $(FREEDM) $(DISTDOCS)
+	LC_ALL=C VERSION=$(VERSION) scripts/makepkgs freedoom $(FREEDOOM1) $(FREEDOOM2) $(DISTDOCS)
 
 json: $(OBJS)
 ifndef JSON
diff --git a/scripts/makepkgs b/scripts/makepkgs
index f5fcdcf1..2d3242aa 100755
--- a/scripts/makepkgs
+++ b/scripts/makepkgs
@@ -34,14 +34,14 @@ full_path = path + "/" + base_dir
 
 # Create directory and add files
 
-run_command("mkdir %s" % full_path)
+run_command("mkdir {}".format(full_path))
 for file in FILES:
-    run_command("cp %s %s" % (file, full_path))
+    run_command("cp {} {}".format(file, full_path))
 
 orig_dir = os.getcwd()
 
 os.chdir(path)
-run_command("rm -f %s.zip" % base_dir)
-run_command("zip -r %s.zip %s" % (base_dir, base_dir))
-run_command("rm -rf %s" % base_dir)
+run_command("rm -f {}.zip".format(base_dir))
+run_command("zip -X {0}.zip {0} {0}/*".format(base_dir))
+run_command("rm -rf {}".format(base_dir))
 os.chdir(orig_dir)