diff --git a/apache/mpm_prefork.pl b/apache/mpm_prefork.pl
new file mode 100755
index 000000000..96e5825ef
--- /dev/null
+++ b/apache/mpm_prefork.pl
@@ -0,0 +1,24 @@
+# mpm_prefork.pl
+# Defines editors for the pre-forking module in apache 2.4.
+# The actual functions for all of these are still in core.pl
+
+sub mpm_prefork_directives
+{
+local $rv;
+$rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
+	[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
+	[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
+	[ 'LockFile', 0, 9, 'global', 2.0 ],
+	[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
+	[ 'MinSpareServers', 0, 0, 'global', 2.0 ],
+	[ 'MaxSpareServers', 0, 0, 'global', 2.0 ],
+	[ 'PidFile', 0, 9, 'global', 2.0 ],
+	[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
+	[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
+	[ 'StartServers', 0, 0, 'global', 2.0 ],
+	[ 'Group', 0, 8, 'global', 2.0 ],
+	[ 'User', 0, 8, 'global', 2.0, 10 ] ];
+return &make_directives($rv, $_[0], "mpm_prefork");
+}
+
+
diff --git a/init/init-lib.pl b/init/init-lib.pl
index 23734a4b1..3c1caf54e 100755
--- a/init/init-lib.pl
+++ b/init/init-lib.pl
@@ -1946,7 +1946,7 @@ foreach my $l (split(/\r?\n/, $out)) {
 # Also find unit files for units that may be disabled at boot and not running,
 # and so don't show up in systemctl list-units
 opendir(UNITS, &get_systemd_root());
-push(@units, grep { !/\.wants$/ && !/^\./ && !/\@/ } readdir(UNITS));
+push(@units, grep { !/\.wants$/ && !/^\./ } readdir(UNITS));
 closedir(UNITS);
 
 # Skip useless units