--- openldap-2.4.35.ebuild	2013-09-06 23:01:28.000000000 +0400
+++ openldap-2.4.35-r1.ebuild	2013-09-17 00:00:49.168190753 +0400
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools systemd
 
 BIS_PN=rfc2307bis.schema
 BIS_PV=20120525
@@ -276,6 +276,19 @@
 		-e 's|/bin/sh|/bin/bash|g' \
 		"${S}"/tests/scripts/* || die "sed failed"
 
+	cp "${FILESDIR}"/slapd.service "${T}"/ || die
+	cp "${FILESDIR}"/slapd-initd-2.4.28-r1 "${T}"/slapd-initd || die
+	if [ $(get_libdir) != lib ]; then
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
+			"${T}"/slapd-initd \
+			"${T}"/slapd.service || die
+	fi
+	# If built without SLP, we don't need to be before avahi
+	use slp \
+		|| sed -i \
+			-e '/before/{s/avahi-daemon//g}' \
+			"${T}"/slapd-initd || die
+
 	cd "${S}"
 	AT_NOEAUTOMAKE=yes eautoreconf
 }
@@ -564,23 +577,18 @@
 		eend
 
 		# install our own init scripts
-		newinitd "${FILESDIR}"/slapd-initd-2.4.28-r1 slapd
+		newinitd "${T}"/slapd-initd slapd
 		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
-		if [ $(get_libdir) != lib ]; then
-			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${ED}"etc/init.d/slapd
-		fi
-		# If built without SLP, we don't need to be before avahi
-		use slp \
-			|| sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"etc/init.d/slapd
+		systemd_dounit "${T}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
 
-		 if use cxx ; then
+		if use cxx ; then
 			einfo "Install the ldapc++ library"
 			cd "${S}/contrib/ldapc++"
 			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed"
 			newdoc README ldapc++-README
-		 fi
+		fi
 
 		if use smbkrb5passwd ; then
 			einfo "Install the smbk5pwd module"