diff --git a/sys-apps/tuned/metadata.xml b/sys-apps/tuned/metadata.xml
index 9958f255bdb68..db0971a1a97a4 100644
--- a/sys-apps/tuned/metadata.xml
+++ b/sys-apps/tuned/metadata.xml
@@ -7,9 +7,12 @@
 </maintainer>
 <longdescription lang="en">
 A tool that performs monitoring and adaptive configuration of the system
-according to selected profile. 
+according to selected profile.
 </longdescription>
 <upstream>
 	<remote-id type="github">redhat-performance/tuned</remote-id>
 </upstream>
+<use>
+	<flag name="ppd">Install tuned-ppd, a drop-in replacement for <pkg>sys-power/power-profiles-daemon</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/tuned/tuned-2.25.1.ebuild b/sys-apps/tuned/tuned-2.25.1-r1.ebuild
similarity index 89%
rename from sys-apps/tuned/tuned-2.25.1.ebuild
rename to sys-apps/tuned/tuned-2.25.1-r1.ebuild
index f0dbc2de388f1..18c674d430fd6 100644
--- a/sys-apps/tuned/tuned-2.25.1.ebuild
+++ b/sys-apps/tuned/tuned-2.25.1-r1.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+ppd"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,7 +27,12 @@ DEPEND="
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/python-linux-procfs[${PYTHON_USEDEP}]
 		dev-python/pyudev[${PYTHON_USEDEP}]
-	')"
+	')
+	ppd? (
+		$(python_gen_cond_dep '
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+		')
+	)"
 
 RDEPEND="
 	${DEPEND}
@@ -35,6 +41,7 @@ RDEPEND="
 	sys-apps/dbus
 	sys-apps/ethtool
 	sys-power/powertop
+	ppd? ( !sys-power/power-profiles-daemon )
 	"
 
 RESTRICT="test"
@@ -53,6 +60,7 @@ src_prepare() {
 
 src_install() {
 	default
+	use ppd && emake DESTDIR="${ED}" install-ppd
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	python_fix_shebang "${D}"
diff --git a/sys-apps/tuned/tuned-2.26.0.ebuild b/sys-apps/tuned/tuned-2.26.0-r1.ebuild
similarity index 89%
rename from sys-apps/tuned/tuned-2.26.0.ebuild
rename to sys-apps/tuned/tuned-2.26.0-r1.ebuild
index f0dbc2de388f1..18c674d430fd6 100644
--- a/sys-apps/tuned/tuned-2.26.0.ebuild
+++ b/sys-apps/tuned/tuned-2.26.0-r1.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+ppd"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,7 +27,12 @@ DEPEND="
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/python-linux-procfs[${PYTHON_USEDEP}]
 		dev-python/pyudev[${PYTHON_USEDEP}]
-	')"
+	')
+	ppd? (
+		$(python_gen_cond_dep '
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+		')
+	)"
 
 RDEPEND="
 	${DEPEND}
@@ -35,6 +41,7 @@ RDEPEND="
 	sys-apps/dbus
 	sys-apps/ethtool
 	sys-power/powertop
+	ppd? ( !sys-power/power-profiles-daemon )
 	"
 
 RESTRICT="test"
@@ -53,6 +60,7 @@ src_prepare() {
 
 src_install() {
 	default
+	use ppd && emake DESTDIR="${ED}" install-ppd
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	python_fix_shebang "${D}"