diff --git a/.SRCINFO b/.SRCINFO
index 6c46282..b5f9747 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tuned
 	pkgdesc = Daemon that performs monitoring and adaptive configuration of devices in the system
 	pkgver = 2.16.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/redhat-performance/tuned
 	install = tuned.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 01b726e..4e0be91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=tuned
 pkgver=2.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon that performs monitoring and adaptive configuration of devices in the system'
 arch=('any')
 url="https://github.com/redhat-performance/${pkgname}"
@@ -18,14 +18,19 @@ install="${pkgname}.install"
 source=("https://github.com/redhat-performance/${pkgname}/archive/v${pkgver}.tar.gz")
 sha256sums=('7f0b858c35fb9695703f04177af074555de59a7a3e94ec0b7e28357584d4502d')
 
+prepare() {
+	cd "${pkgname}-${pkgver}"
+	mv libexec lib
+
+	sed -i 's/libexec/lib/g' Makefile
+	sed -i 's/sbin/bin/g' Makefile
+}
+
 package() {
 	cd "${pkgname}-${pkgver}"
 
 	make DESTDIR="${pkgdir}" install
+	rm -r "${pkgdir}"/{run,var}
 
-	mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
-	mv "${pkgdir}"/usr/libexec/tuned/* "${pkgdir}"/usr/lib/tuned/
-	rm -r "${pkgdir}"/run "${pkgdir}"/usr/sbin "${pkgdir}"/usr/libexec
-
-	install -Dm644 "${srcdir}/${pkgname}-${pkgver}/tuned.service" "${pkgdir}/usr/lib/systemd/system/tuned.service"
+	install -Dm644 tuned.service "${pkgdir}/usr/lib/systemd/system/"
 }