diff --git a/net-irc/irker/irker-2.12.ebuild b/net-irc/irker/irker-2.12.ebuild
index 20a48e7..24d2064 100644
--- a/net-irc/irker/irker-2.12.ebuild
+++ b/net-irc/irker/irker-2.12.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irker/irker-2.12.ebuild,v 1.2 2014/11/28 13:32:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irker/irker-1.20.ebuild,v 1.1 2013/05/22 03:40:55 patrick Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl"
 
-inherit python-single-r1 eutils
+inherit python-r1 systemd eutils
 
 DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
+HOMEPAGE="http://www.catb.org/esr/irker"
 SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -22,24 +22,32 @@ DEPEND="app-text/docbook-xml-dtd:4.1.2
 
 src_prepare() {
 	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+	epatch "${FILESDIR}/${PV}-irkerhook-Register-author_name-as-author-instead-of-.patch"
+	epatch "${FILESDIR}/${PV}-irkerhook-Remove-file-listing.patch"
 
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile
 
 	# Prefix support
 	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install
+	python_install () {
+		emake DESTDIR="${ED}" install
 
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
+		python_doscript "${ED}/usr/bin/irkerd"
+		# Not installed with the default Makefile
+		python_doscript irk irkerhook.py
+	}
+
+	python_foreach_impl python_install
 
 	newinitd "${FILESDIR}/irkerd.initd" irkerd
 	newconfd "${FILESDIR}/irkerd.confd" irkerd
 
+	systemd_dounit irkerd.service
+
 	dodoc NEWS README hacking.txt security.txt
 	dohtml irkerd.html irkerhook.html