diff --git a/init/atboot.pl b/init/atboot.pl
index 954616fdb..9f0d4df46 100755
--- a/init/atboot.pl
+++ b/init/atboot.pl
@@ -130,13 +130,14 @@ elsif ($init_mode eq "systemd") {
 	     undef,
 	       { 'pidfile' => "$var_directory/miniserv.pid",
 	         'opts'    => {
-	         'env'        => '"PERLLIB=' . $root_directory . '"',
-	         'stop'       => "$kill \$MAINPID",
-	         'reload'     => "$kill -HUP \$MAINPID",
-	         'type'       => 'forking',
-	         'restart'    => 'always',
-	         'restartsec' => '2s',
-	         'timeout'    => '15s',
+	         'env'            => '"PERLLIB=' . $root_directory . '"',
+	         'stop'           => "$kill \$MAINPID",
+	         'reload'         => "$kill -HUP \$MAINPID",
+	         'type'           => 'forking',
+	         'restart'        => 'always',
+	         'restartsec'     => '2s',
+	         'timeout'        => '15s',
+	         'timeoutstopsec' => '300s',
 	       }},
 	     );
 	}
diff --git a/init/init-lib.pl b/init/init-lib.pl
index 53770b76d..e070d9000 100644
--- a/init/init-lib.pl
+++ b/init/init-lib.pl
@@ -2380,6 +2380,7 @@ if (ref($opts)) {
 	&print_tempfile(CFILE, "Restart=$opts->{'restart'}\n") if ($opts->{'restart'});
 	&print_tempfile(CFILE, "RestartSec=$opts->{'restartsec'}\n") if ($opts->{'restartsec'});
 	&print_tempfile(CFILE, "TimeoutSec=$opts->{'timeout'}\n") if ($opts->{'timeout'});
+	&print_tempfile(CFILE, "TimeoutStopSec=$opts->{'timeoutstopsec'}\n") if ($opts->{'timeoutstopsec'});
 	&print_tempfile(CFILE, "StandardOutput=file:$opts->{'logstd'}\n") if ($opts->{'logstd'});
 	&print_tempfile(CFILE, "StandardError=file:$opts->{'logerr'}\n") if ($opts->{'logerr'});
 	}