diff --git a/makedist.pl b/makedist.pl
index 631dbbfe2..94e4cc5c7 100755
--- a/makedist.pl
+++ b/makedist.pl
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 # Builds a tar.gz package of a specified Webmin version
-use Cwd 'abs_path', 'getcwd';
+
 if ($0 =~ /^(.*)\//) {
 	chdir($1);
 	}
@@ -88,14 +88,7 @@ else {
 # Build EOL data
 if (-r "./webmin/os-eol-lib.pl") {
 	print "Building OS EOL data\n";
-	print "Before do: ", getcwd(), "\n";
-	do "./web-lib-funcs.pl";
-	print "After do 1: ", getcwd(), "\n";
-	do "./webmin/os-eol-lib.pl";
-	print "After do 2: ", getcwd(), "\n";
-	&eol_build_all_os_data("./os_eol.json");
-	print "After run 1: ", getcwd(), "\n";
-	print &backquote_command("cat ./os_eol.json");
+	system("./os-eol.pl");
 	}
 
 # Prepare dist files
diff --git a/os-eol.pl b/os-eol.pl
new file mode 100755
index 000000000..14e94a7ec
--- /dev/null
+++ b/os-eol.pl
@@ -0,0 +1,6 @@
+#!/usr/local/bin/perl
+# Build EOL data JSON file
+
+do "./web-lib-funcs.pl";
+do "./webmin/os-eol-lib.pl";
+&eol_build_all_os_data("./os_eol.json");