Finish systemd support, release 2