diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index e2d6f540d..cc3b5b8d7 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -29,8 +29,8 @@ pkgname=(
   qemu-vhost-user-gpu
   qemu-{base,desktop,emulators-full,full}
 )
-pkgver=8.0.3
-pkgrel=1
+pkgver=8.0.4
+pkgrel=2
 pkgdesc="A generic and open source machine emulator and virtualizer"
 arch=(x86_64)
 url="https://www.qemu.org/"
@@ -108,14 +108,14 @@ source=(
   65-kvm.rules
   99-qemu-guest-agent.rules
 )
-sha512sums=('18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3'
+sha512sums=('bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449'
             'SKIP'
             '7b412ffa5dcda47b0a4ec9e2c5e5e1d9eaaaf0a087b7ea3ead3e706ba4c9cafb919beadd088a0299b6f7aab753b81a5eafb545b4842ee5f26646d16544dd02a7'
             '6e838773d63ae0ffdffe2b891bf611d8f5f3c67a9bc4cbbedf8363c150c2c9971c8e44d92270bc581af40eb0ece02192760bcdd6aee229fff55635f3a4825afa'
             '985c2c7a6b5217c87a15b45368089ee91b2f9027b070f9eafa448a18b27ae0d9edd964d52e134b9c1f4aeef4d6aae88afd3f454551ca898affef7f9d28b99b8f'
             'bdf05f99407491e27a03aaf845b7cc8acfa2e0e59968236f10ffc905e5e3d5e8569df496fd71c887da2b5b8d1902494520c7da2d3a8258f7fd93a881dd610c99'
             '93b905046fcea8a0a89513b9259c222494ab3b91319dde23baebcb40dc17376a56661b159b99785d6e816831974a0f3cbd7b2f7d89e5fc3c258f88f4492f3839')
-b2sums=('071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3'
+b2sums=('dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915'
         'SKIP'
         'b1eca364aa60f130ff5e649f5d004d3fcb75356d3421a4542efdfc410d39b40d9434d15e1dd7bbdbd315cb72b5290d3ea5f77f9c41961a5601cd28ef7bbe72e8'
         '2102e4a34e11e406e9606c97e026e7b92e887e296a7f77b9cede1b37119d0df33735f3588628167b2b8e32244c196c491bfab623e2caddac9014d445aa2a6d98'
@@ -154,17 +154,21 @@ _qemu_system_deps=(
   zstd libzstd.so
 )
 
-_qemu_common_optdepends=(
+_qemu_full_optdepends=(
   'qemu-user-static: for static user mode emulation of QEMU targets'
   'samba: for SMB/CIFS server support'
 )
 
 _qemu_desktop_optdepends=(
-  "${_qemu_common_optdepends[@]}"
+  "${_qemu_full_optdepends[@]}"
   'qemu-block-gluster: for Gluster block driver'
   'qemu-block-iscsi: for iSCSI block driver'
   'qemu-chardev-baum: for Baum chardev driver'
   'qemu-docs: for documentation'
+  'qemu-emulators-full: for all system emulators'
+  'qemu-full: for a full QEMU installation'
+  'qemu-hw-s390x-virtio-gpu-ccw: for s390x-virtio-gpu-ccw display device'
+  'qemu-pr-helper: for persistent reservation utility'
   'qemu-system-aarch64: for AARCH64 system emulator'
   'qemu-system-alpha: for Alpha system emulator'
   'qemu-system-arm: for ARM system emulator'
@@ -185,9 +189,8 @@ _qemu_desktop_optdepends=(
   'qemu-system-tricore: for tricore system emulator'
   'qemu-system-xtensa: for Xtensa system emulator'
   'qemu-tests: for QEMU tests'
+  'qemu-tools: for QEMU tools'
   'qemu-user: for user mode emulation of QEMU targets'
-  'qemu-user-static: for static user mode emulation of QEMU targets'
-  'samba: for SMB/CIFS server support'
 )
 
 _qemu_base_optdepends=(
@@ -198,11 +201,31 @@ _qemu_base_optdepends=(
   'qemu-audio-oss: for OSS audio driver'
   'qemu-audio-pa: for PulseAudio audio driver'
   'qemu-audio-sdl: for SDL audio driver'
+  'qemu-audio-spice: for spice audio driver'
+  'qemu-block-curl: for curl block driver'
+  'qemu-block-dmg: for DMG block driver'
+  'qemu-block-nfs: for NFS block driver'
+  'qemu-block-ssh: for SSH block driver'
+  'qemu-chardev-spice: for the spice chardev driver'
+  'qemu-desktop: for dependencies commonly used on a desktop'
+  'qemu-hw-display-virtio-vga: for the virtio-vga display device'
+  'qemu-hw-display-virtio-vga-gl: for the virtio-vga-gl display device'
+  'qemu-hw-display-qxl: for the QXL display device'
+  'qemu-hw-display-virtio-gpu: for the virtio-gpu display device'
+  'qemu-hw-display-virtio-gpu-gl: for the virtio-gpu-gl display device'
+  'qemu-hw-display-virtio-gpu-pci: for the virtio-gpu-pci display device'
+  'qemu-hw-display-virtio-gpu-pci-gl: for the virtio-gpu-pci-gl display device'
+  'qemu-hw-usb-host: for host USB support'
+  'qemu-hw-usb-redirect: for USB redirect support'
+  'qemu-hw-usb-smartcard: for USB smartcard support'
+  'qemu-ui-curses: for ncurses UI driver'
   'qemu-ui-dbus: for D-Bus UI driver'
   'qemu-ui-egl-headless: for EGL headless UI driver'
   'qemu-ui-gtk: for GTK UI driver'
   'qemu-ui-opengl: for OpenGL UI driver'
   'qemu-ui-sdl: for SDL UI driver'
+  'qemu-ui-spice-app: for spice app UI driver'
+  'qemu-ui-spice-core: for spice core UI driver'
   'qemu-user: for user mode emulation of QEMU targets'
   'qemu-vhost-user-gpu: for vhost-user-gpu display device'
 )
@@ -944,17 +967,7 @@ package_qemu-base() {
   pkgdesc="A basic QEMU setup for headless environments"
   depends=(
     qemu-common=$pkgver-$pkgrel
-    qemu-audio-spice=$pkgver-$pkgrel
-    qemu-block-{curl,dmg,nfs,ssh}=$pkgver-$pkgrel
-    qemu-chardev-spice=$pkgver-$pkgrel
-    qemu-hw-display-{qxl,virtio-gpu{,-{gl,pci,pci-gl}}}=$pkgver-$pkgrel
-    qemu-hw-display-virtio-vga{,-gl}=$pkgver-$pkgrel
-    qemu-hw-s390x-virtio-gpu-ccw=$pkgver-$pkgrel
-    qemu-hw-usb-{host,redirect,smartcard}=$pkgver-$pkgrel
     qemu-img=$pkgver-$pkgrel
-    qemu-pr-helper=$pkgver-$pkgrel
-    qemu-tools=$pkgver-$pkgrel
-    qemu-ui-{curses,spice-{app,core}}=$pkgver-$pkgrel
     virtiofsd
   )
   # Add the native target as the dependency.
@@ -966,29 +979,21 @@ package_qemu-base() {
     depends+=(qemu-system-arm=$pkgver-$pkgrel)
   fi
   optdepends=("${_qemu_base_optdepends[@]}")
-  # TODO: remove conflicts/provides/replaces for qemu-headless after 2022-10-01
-  conflicts=(qemu qemu-headless)
-  provides=(qemu=$pkgver qemu-headless)
-  replaces=(qemu-headless)
+  provides=(qemu=$pkgver)
 }
 
 package_qemu-desktop() {
   pkgdesc="A QEMU setup for desktop environments"
   depends=(
-    qemu-common=$pkgver-$pkgrel
+    qemu-base=$pkgver-$pkgrel
     qemu-audio-{alsa,dbus,jack,oss,pa,sdl,spice}=$pkgver-$pkgrel
     qemu-block-{curl,dmg,nfs,ssh}=$pkgver-$pkgrel
     qemu-chardev-spice=$pkgver-$pkgrel
     qemu-hw-display-{qxl,virtio-gpu{,-{gl,pci,pci-gl}}}=$pkgver-$pkgrel
     qemu-hw-display-virtio-vga{,-gl}=$pkgver-$pkgrel
-    qemu-hw-s390x-virtio-gpu-ccw=$pkgver-$pkgrel
     qemu-hw-usb-{host,redirect,smartcard}=$pkgver-$pkgrel
-    qemu-img=$pkgver-$pkgrel
-    qemu-pr-helper=$pkgver-$pkgrel
-    qemu-tools=$pkgver-$pkgrel
     qemu-ui-{curses,dbus,egl-headless,gtk,opengl,sdl,spice-{app,core}}=$pkgver-$pkgrel
     qemu-vhost-user-gpu=$pkgver-$pkgrel
-    virtiofsd
   )
   # Add the native target as the dependency.
   if [ $CARCH == "x86_64" ]; then
@@ -999,9 +1004,7 @@ package_qemu-desktop() {
     depends+=(qemu-system-arm=$pkgver-$pkgrel)
   fi
   optdepends=("${_qemu_desktop_optdepends[@]}")
-  conflicts=(qemu)
   provides=(qemu=$pkgver)
-  replaces=('qemu<7')
 }
 
 package_qemu-emulators-full() {
@@ -1010,35 +1013,24 @@ package_qemu-emulators-full() {
     qemu-system-{aarch64,alpha,arm,avr,cris,hppa,loongarch64,m68k,microblaze,mips,nios2,or1k,ppc,riscv,rx,s390x,sh4,sparc,tricore,x86,xtensa}=$pkgver-$pkgrel
     qemu-user=$pkgver-$pkgrel
   )
-  # TODO: remove conflicts/provides/replaces after 2022-10-01
-  conflicts=(qemu-arch-extra qemu-headless-arch-extra)
-  provides=(qemu-arch-extra qemu-headless-arch-extra)
-  replaces=(qemu-arch-extra qemu-headless-arch-extra)
 }
 
 package_qemu-full() {
   pkgdesc="A full QEMU setup"
   depends=(
-    qemu-common=$pkgver-$pkgrel
     qemu-audio-{alsa,dbus,jack,oss,pa,sdl,spice}=$pkgver-$pkgrel
-    qemu-block-{curl,dmg,gluster,iscsi,nfs,ssh}=$pkgver-$pkgrel
-    qemu-chardev-{baum,spice}=$pkgver-$pkgrel
+    qemu-block-{gluster,iscsi}=$pkgver-$pkgrel
+    qemu-chardev-baum=$pkgver-$pkgrel
+    qemu-desktop=$pkgver-$pkgrel
     qemu-docs=$pkgver-$pkgrel
-    qemu-hw-display-{qxl,virtio-{gpu{,-{gl,pci,pci-gl}},vga{,-gl}}}=$pkgver-$pkgrel
+    qemu-emulators-full=$pkgver-$pkgrel
     qemu-hw-s390x-virtio-gpu-ccw=$pkgver-$pkgrel
-    qemu-hw-usb-{host,redirect,smartcard}=$pkgver-$pkgrel
-    qemu-img=$pkgver-$pkgrel
     qemu-pr-helper=$pkgver-$pkgrel
-    qemu-system-{aarch64,alpha,arm,avr,cris,hppa,loongarch64,m68k,microblaze,mips,nios2,or1k,ppc,riscv,rx,s390x,sh4,sparc,tricore,x86,xtensa}=$pkgver-$pkgrel
     qemu-tests=$pkgver-$pkgrel
     qemu-tools=$pkgver-$pkgrel
-    qemu-ui-{curses,dbus,egl-headless,gtk,opengl,sdl,spice-{app,core}}=$pkgver-$pkgrel
     qemu-user=$pkgver-$pkgrel
-    qemu-vhost-user-gpu=$pkgver-$pkgrel
-    virtiofsd
   )
-  optdepends=("${_qemu_common_optdepends[@]}")
-  conflicts=(qemu)
+  optdepends=("${_qemu_full_optdepends[@]}")
   provides=(qemu=$pkgver)
 }