diff --git a/.SRCINFO b/.SRCINFO
index 93f411e..f1ede23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = tuned
 	pkgdesc = Daemon that performs monitoring and adaptive configuration of devices in the system
-	pkgver = 2.19.0
-	pkgrel = 1
+	pkgver = 2.24.0
+	pkgrel = 3
 	url = https://github.com/redhat-performance/tuned
-	install = tuned.install
 	arch = any
-	license = GPL
+	license = GPL-2.0-or-later
 	makedepends = desktop-file-utils
 	depends = dbus-glib
 	depends = ethtool
@@ -18,10 +17,29 @@ pkgbase = tuned
 	depends = python-linux-procfs
 	depends = python-perf
 	depends = python-pyudev
-	optdepends = virt-what: For use with virtual machines
-	optdepends = systemtap: Disk and net statistic monitoring systemtap scripts
-	backup = etc/tuned/active_profile
-	source = https://github.com/redhat-performance/tuned/archive/v2.19.0.tar.gz
-	sha256sums = 3cb2aeb9ecebd66a1a1c3aaff9589f5c5402201d16f7caa01acf0b9374ed8724
+	source = https://github.com/redhat-performance/tuned/archive/v2.24.0/tuned-2.24.0.tar.gz
+	sha512sums = d004cd621e26195fff14b39f29b2143cf47de09641454acd3029d61142c3d000a452f018356c84c32772bd99fc766f6ee847d2a8eddbde8ae34aaa0ecefa644e
 
 pkgname = tuned
+	optdepends = virt-what: virtual machine detection
+	optdepends = systemtap: detailed system monitoring
+	optdepends = tuned-ppd: power-profiles-daemon api translation
+	optdepends = wireless_tools: wireless device power management
+	backup = etc/tuned/active_profile
+	backup = etc/tuned/bootcmdline
+	backup = etc/tuned/cpu-partitioning-powersave-variables.conf
+	backup = etc/tuned/cpu-partitioning-variables.conf
+	backup = etc/tuned/post_loaded_profile
+	backup = etc/tuned/profile_mode
+	backup = etc/tuned/realtime-variables.conf
+	backup = etc/tuned/realtime-virtual-guest-variables.conf
+	backup = etc/tuned/realtime-virtual-host-variables.conf
+	backup = etc/tuned/tuned-main.conf
+
+pkgname = tuned-ppd
+	pkgdesc = Daemon that allows applications to easily transition to TuneD from power-profiles-daemon (PPD)
+	depends = tuned
+	provides = power-profiles-daemon
+	conflicts = power-profiles-daemon
+	options = !emptydirs
+	backup = etc/tuned/ppd.conf
diff --git a/PKGBUILD b/PKGBUILD
index e3085cb..ee2408d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,62 @@
 # Contributor: Timothée Ravier <tim at siosm dot fr>
 # Contributor: Tom <reztho at archlinux dot org>
 
-pkgname=tuned
-pkgver=2.19.0
-pkgrel=1
+pkgbase=tuned
+pkgname=("${pkgbase}" "${pkgbase}-ppd")
+pkgver=2.24.0
+pkgrel=3
 pkgdesc='Daemon that performs monitoring and adaptive configuration of devices in the system'
 arch=('any')
-url="https://github.com/redhat-performance/${pkgname}"
-license=('GPL')
+url="https://github.com/redhat-performance/${pkgbase}"
+license=('GPL-2.0-or-later')
 depends=('dbus-glib' 'ethtool' 'gawk' 'hdparm' 'polkit' 'python-configobj' 'python-dbus' 'python-gobject' 'python-linux-procfs' 'python-perf' 'python-pyudev')
-optdepends=('virt-what: For use with virtual machines' 'systemtap: Disk and net statistic monitoring systemtap scripts')
 makedepends=('desktop-file-utils')
-backup=('etc/tuned/active_profile')
-install="${pkgname}.install"
-source=("https://github.com/redhat-performance/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('3cb2aeb9ecebd66a1a1c3aaff9589f5c5402201d16f7caa01acf0b9374ed8724')
+source=("https://github.com/redhat-performance/${pkgbase}/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz")
+sha512sums=('d004cd621e26195fff14b39f29b2143cf47de09641454acd3029d61142c3d000a452f018356c84c32772bd99fc766f6ee847d2a8eddbde8ae34aaa0ecefa644e')
 
 prepare() {
-	cd "${pkgname}-${pkgver}"
+	cd "${pkgbase}-${pkgver}"
 	mv libexec lib
 
-	sed -i 's/libexec/lib/g' Makefile
-	sed -i 's/sbin/bin/g' Makefile
+	sed -i 's|/libexec/|/lib/|g' Makefile
+	sed -i 's|/sbin/|/bin/|g' Makefile tuned.service tuned-gui.py tuned-gui.desktop tuned/ppd/tuned-ppd.service
+	sed -i 's|install-ppd: install$|install-ppd: install-dirs|' Makefile
 }
 
-package() {
-	cd "${pkgname}-${pkgver}"
+package_tuned() {
+	optdepends=('virt-what: virtual machine detection'
+		'systemtap: detailed system monitoring'
+		'tuned-ppd: power-profiles-daemon api translation'
+		'wireless_tools: wireless device power management')
+	backup=('etc/tuned/active_profile'
+		'etc/tuned/bootcmdline'
+		'etc/tuned/cpu-partitioning-powersave-variables.conf'
+		'etc/tuned/cpu-partitioning-variables.conf'
+		'etc/tuned/post_loaded_profile'
+		'etc/tuned/profile_mode'
+		'etc/tuned/realtime-variables.conf'
+		'etc/tuned/realtime-virtual-guest-variables.conf'
+		'etc/tuned/realtime-virtual-host-variables.conf'
+		'etc/tuned/tuned-main.conf')
+
+	cd "${pkgbase}-${pkgver}"
 
 	make DESTDIR="${pkgdir}" install
-	rm -r "${pkgdir}"/{run,var}
+	rm -rv "${pkgdir}"/{run,var}
 
 	python -m compileall -d /usr/lib "${pkgdir}/usr/lib"
 	python -O -m compileall -d /usr/lib "${pkgdir}/usr/lib"
-
-	install -Dm644 tuned.service "${pkgdir}/usr/lib/systemd/system/"
+}
+
+package_tuned-ppd() {
+	pkgdesc='Daemon that allows applications to easily transition to TuneD from power-profiles-daemon (PPD)'
+	depends=('tuned')
+	provides=('power-profiles-daemon')
+	conflicts=('power-profiles-daemon')
+	backup=('etc/tuned/ppd.conf')
+	options=('!emptydirs')
+
+	cd "${pkgbase}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install-ppd
 }
diff --git a/tuned.install b/tuned.install
deleted file mode 100644
index 974c867..0000000
--- a/tuned.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	systemd-tmpfiles --create tuned.conf
-}
-
-pre_remove() {
-	systemd-tmpfiles --remove tuned.conf
-}