--- /usr/portage/net-fs/samba/samba-4.1.8.ebuild	2014-06-04 02:51:23.000000000 -0400
+++ /usr/local/portage/net-fs/samba/samba-4.1.8-r1.ebuild	2014-06-20 11:57:54.000000000 -0400
@@ -20,7 +20,7 @@
 SLOT="0"
 
 IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog test winbind"
+ldap quota selinux syslog systemd test winbind"
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
 # dev-libs/libaio is an automagic dependency (see bug #489764)
@@ -106,6 +106,7 @@
 		--nopyo \
 		--bundled-libraries=NONE \
 		--builtin-libraries=NONE \
+		$(use_with systemd) \
 		$(use_with addns dnsupdate) \
 		$(use_with acl acl-support) \
 		$(use_with ads) \
@@ -146,12 +147,14 @@
 	newinitd "${CONFDIR}/samba4.initd-r1" samba
 	newconfd "${CONFDIR}/samba4.confd" samba
 
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-	systemd_dounit "${FILESDIR}"/samba.service
+    if use systemd; then
+      systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	  systemd_dounit "${FILESDIR}"/nmbd.service
+	  systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	  systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	  systemd_dounit "${FILESDIR}"/winbindd.service
+	  systemd_dounit "${FILESDIR}"/samba.service
+   fi
 }
 
 src_test() {