diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index be086f28754..293ef8fb35b 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -4,7 +4,8 @@ version=29
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-distro=gentoo --with-rootdir= --localstatedir=/var
---with-pamlibdir=/lib/security --disable-selinux"
+--with-pamlibdir=/lib/security --disable-selinux
+--with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc/init.d"
 short_desc="systemd is a system and service manager for Linux"
 maintainer="Mike Rosset <mike.rosset@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
@@ -19,6 +20,7 @@ long_desc="
  implements an elaborate transactional dependency-based service control logic. 
  It can work as a drop-in replacement for sysvinit."
 
+system_groups="lock"
 subpackages="systemd-admin systemd-gnome-passwd-agent systemd-devel"
 conf_files="/etc/systemd/system.conf"
 
@@ -28,6 +30,7 @@ Add_dependency run tcp_wrappers-libs
 Add_dependency run pam
 Add_dependency run libcap
 Add_dependency run dbus-libs
+Add_dependency run dbus
 
 Add_dependency build m4
 Add_dependency build pkg-config
@@ -40,6 +43,12 @@ Add_dependency build glib-devel
 Add_dependency build gtk+-devel
 Add_dependency build libnotify-devel
 
+pre_configure()
+{
+	sed -i -e "s|/usr/bin/loadkeys|/sbin/loadkeys|g" Makefile.in
+	sed -i -e "s|/usr/bin/setfont|/sbin/setfont|g" Makefile.in
+}
+
 pre_install()
 {
 	install -d ${DESTDIR}