diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 551c9fcbe..4fb3f6693 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(qemu qemu-headless qemu-arch-extra qemu-headless-arch-extra
          qemu-block-{iscsi,gluster} qemu-guest-agent)
 pkgdesc="A generic and open source machine emulator and virtualizer"
 pkgver=5.1.0
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
 url="https://wiki.qemu.org/"
@@ -23,7 +23,7 @@ _headlessdeps=(gnutls libpng libaio numactl libnfs
 depends=(virglrenderer sdl2 vte3 libpulse libjack.so brltty "${_headlessdeps[@]}")
 makedepends=(spice-protocol python libiscsi glusterfs python-sphinx xfsprogs)
 source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}
-        qemu-ga.service
+        qemu-guest-agent.service
         65-kvm.rules)
 sha512sums=('e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3'
             'SKIP'
@@ -201,9 +201,10 @@ package_qemu-block-gluster() {
 package_qemu-guest-agent() {
   pkgdesc="QEMU Guest Agent"
   depends=(gcc-libs glib2 libudev.so)
+  install=qemu-guest-agent.install
 
   install -D build-full/qemu-ga "$pkgdir/usr/bin/qemu-ga"
-  install -Dm644 qemu-ga.service "$pkgdir/usr/lib/systemd/system/qemu-ga.service"
+  install -Dm644 qemu-guest-agent.service "$pkgdir/usr/lib/systemd/system/qemu-guest-agent.service"
   install -Dm755 "$srcdir/qemu-$pkgver/scripts/qemu-guest-agent/fsfreeze-hook" "$pkgdir/etc/qemu/fsfreeze-hook"
 }
 
diff --git a/extra/qemu/qemu-guest-agent.install b/extra/qemu/qemu-guest-agent.install
new file mode 100644
index 000000000..0928e0bb8
--- /dev/null
+++ b/extra/qemu/qemu-guest-agent.install
@@ -0,0 +1,6 @@
+post_upgrade() {
+    echo "qemu-ga.service was renamed to qemu-guest-agent.service"
+    echo "You might want to switch to the new service name:"
+    echo "# systemctl disable qemu-ga.service"
+    echo "# systemctl enable qemu-guest-agent.service"
+}
diff --git a/extra/qemu/qemu-ga.service b/extra/qemu/qemu-guest-agent.service
similarity index 100%
rename from extra/qemu/qemu-ga.service
rename to extra/qemu/qemu-guest-agent.service