--- /usr/portage/net-fs/samba/samba-3.6.14-r1.ebuild	2013-05-12 12:48:34.000000000 +0400
+++ net-fs/samba/samba-3.6.14-r2.ebuild	2013-05-13 16:19:44.926058848 +0400
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.14-r1.ebuild,v 1.1 2013/05/12 08:48:34 pacho Exp $
+# $Header: $
 
 EAPI=4
 
-inherit pam versionator multilib eutils
+inherit pam versionator multilib eutils systemd
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -371,6 +371,15 @@
 		newconfd "${CONFDIR}/samba.confd" samba
 		newinitd "${CONFDIR}/samba.initd" samba
 
+		sed -i \
+			-e '/^EnvironmentFile/d' \
+			-e '/^PIDFile/s:/run/:/var/run/samba/:' \
+			../packaging/systemd/*.service || die
+		systemd_dounit ../packaging/systemd/nmb.service
+		systemd_dounit ../packaging/systemd/smb.service
+		use winbind && systemd_dounit ../packaging/systemd/winbind.service
+		systemd_newtmpfilesd "${CONFDIR}/samba.tmpfilesd" samba.conf
+
 		insinto /etc/samba
 		doins "${CONFDIR}"/{smbusers,lmhosts}