diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index cd4b56a14..de785c07a 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -17,5 +17,6 @@ DIST acpid-2.0.17.tar.xz 149440 SHA256 36b7d2c7deb6a44ae87b28026ff368f96e66b3ee8
 EBUILD acpid-2.0.12.ebuild 1420 SHA256 6d8d6a08ddadd4f3211bd61be1fefe58a1a0fd5a85f905a516e8a2c103ec1075 SHA512 6644734102b7b5d2ab7083a29a8125f505b9814ddecae3f9163a881a93011380f455aac5e98017cf31c4c8148f6bf3fd2cbdc20c541e49daa08ed5ed0ecdfcd9 WHIRLPOOL bc4e781578416a24e9d29d7ece713c86a1c5842a0f5e7f84390864ffa9290800769eb13562c714ababfeec13388d05e63c0e2881917234f34c49af0055fbaceb
 EBUILD acpid-2.0.14.ebuild 1394 SHA256 e62d1d389a3267162caf5b69c25171b6572114ab67c41f23b79e21857306ca58 SHA512 89177af5eb0063b123d8ef79ff2f2024dfa0804ae3f9690fc3067383a0c8ca710d4c226caa428290239df76797d90df04c9ecd60b47874b2f6f7d7bd1e158859 WHIRLPOOL 81a5c7af38058392d835dc2279a64c418fa4a168e34978cc96a845ef378b0e568dfaa4064a9a1655fc16cd6271b5be95d5fcf8f52ffdb8f01c173e38c46238a4
 EBUILD acpid-2.0.16-r1.ebuild 1546 SHA256 861dcc28cfcb83859eded0aee0d981cc259d951231b36c1cce780f8fa0a7166a SHA512 b7911c75d0cd4a5b29972d57dec9766a995722848970486300210e7379ee2036a114bb927d95b8048514f1589562d76869583a1d6efbd300facd46f7b7fb0c3c WHIRLPOOL 680ff63721ab28605e084cae53312af769f0a79869b3063fbd648bb39dba98de8faa6702c7387bdc20a4010c09f4b54b1611687c51d69c967ddd7ac55960b9be
+EBUILD acpid-2.0.17-r1.ebuild 1747 SHA256 914ad4e50598cbb88b959dc4baab2efadcdfaff6ac4308d45b1cc5a5204eb093 SHA512 81eb0c104e9a519e7ceebb032ce6c319b7d9a2e20603a223c6bf2e3b21eab5f7ebdb416936730492f80a82774a4ee8242d24bd447d7d16a2fad0171992759a5d WHIRLPOOL fb5dea3484cd8eb2dcb1c3ab09614972b00a810403d2213138dddae1b2225ab1c1f644d6fc80ceb45ffa2512160300b02ecc5c10b82ae01b34c0c23498334bd6
 EBUILD acpid-2.0.17.ebuild 1598 SHA256 764f4bd961a4c9203bd400fa23838df47533aadd4075750671e29152a97286db SHA512 67121ba8e5d9553f9e2c91db42614e569d865b53c51938f9c4828fb6763e6dd0ca86377a04504eb63d7ad53d77f6fe82e39ee0472bc4b0614c25b595ff72935d WHIRLPOOL 076df9befbd0509a6b0ea1f6e42360df9f73eeacfe6d2b0b6ce889d9f24109222174ebab476333cef50d83c378aabd115d738feb2564a53da95dcbbfa4e92e0c
 MISC metadata.xml 161 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89 SHA512 b0b15689fd95ca9273dfc3b541b0b6edac9c6a0b2dcb8e5f0c0af47714faf45d89bac14c9cbfd0f0ce77614b216bcfd5ae5d998677cf47ff7b13216e81d572e7 WHIRLPOOL 7903565b0294c7aca6efc3c172f1b8a493f9008fbd1267d23ff5ee4fa3d16126c91a6455e2922903ef9075733c41ae70810d7667909b9a86ef600c1805639496
diff --git a/sys-power/acpid/acpid-2.0.17-r1.ebuild b/sys-power/acpid/acpid-2.0.17-r1.ebuild
new file mode 100644
index 000000000..ca6d85eea
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.17-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.17-r1.ebuild,v 1.4 2013/01/21 14:31:11 ago Exp $
+
+EAPI=4
+inherit systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html"
+SRC_URI="http://tedfelix.com/linux/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 -ppc x86"
+IUSE="pentoo selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newdoc kacpimon/README README.kacpimon
+	dodoc -r samples
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+
+	exeinto /etc/acpi
+
+	if use pentoo; then
+		newexe "${FILESDIR}"/${PN}-pentoo-1.0.6-default.sh default.sh
+	else
+		newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
+	fi
+
+	exeinto /etc/acpi/actions
+	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+	insinto /etc/acpi/events
+	newins "${FILESDIR}"/${PN}-1.0.4-default default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
+		elog
+	fi
+
+	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+	mkdir -p "${ROOT}"/run
+
+	if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}