--- dev-util/buildbot/buildbot-0.8.12.ebuild	2015-08-24 13:01:05.000000000 +0200
+++ dev-util/buildbot/buildbot-0.8.12-r1.ebuild	2016-01-02 22:36:40.084851711 +0100
@@ -82,7 +82,9 @@
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
 	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
 
 	readme.gentoo_create_doc
 }