diff --git a/repos/testing-x86_64/PKGBUILD b/repos/testing-x86_64/PKGBUILD
index 5aee363..1268b32 100644
--- a/repos/testing-x86_64/PKGBUILD
+++ b/repos/testing-x86_64/PKGBUILD
@@ -53,12 +53,6 @@ build() {
 _build() (
   cd build-$1
 
-  # qemu vs. make 4 == bad
-  export ARFLAGS=rv
-
-  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-  export CFLAGS+=" -fPIC"
-
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -99,7 +93,7 @@ _package() {
                'qemu-block-rbd: RBD block support'
                'qemu-block-gluster: glusterfs block support')
   install=qemu.install
-  options=(!strip)
+  options=(!strip !emptydirs)
 
   make -C build-$1 DESTDIR="$pkgdir" install "${@:2}"
 
@@ -111,7 +105,6 @@ _package() {
   rm -r var
 
   cd usr/lib
-  tidy_strip
 
   # bridge_helper needs suid
   # https://bugs.archlinux.org/task/32565
@@ -121,7 +114,6 @@ _package() {
   rm qemu/block-{iscsi,rbd,gluster}.so
 
   cd ../bin
-  tidy_strip
 
   # remove extra arch
   for _bin in qemu-*; do
@@ -132,7 +124,7 @@ _package() {
       ga) rm "$_bin"; continue ;;
 
       # tools
-      img|io|nbd) continue ;;
+      edid|img|io|keymap|nbd|pr-helper|storage-daemon) continue ;;
 
       # core emu
       system-${_corearch}) continue ;;
@@ -147,25 +139,31 @@ _package() {
 
     case $_blob in
       # provided by seabios package
-      bios.bin|acpi-dsdt.aml|bios-256k.bin|vgabios-cirrus.bin|vgabios-qxl.bin|\
+      bios.bin|bios-256k.bin|vgabios-cirrus.bin|vgabios-qxl.bin|\
       vgabios-stdvga.bin|vgabios-vmware.bin|vgabios-virtio.bin|vgabios-bochs-display.bin|\
       vgabios-ramfb.bin) rm "$_blob"; continue ;;
 
+      # provided by edk2-ovmf package
+      edk2-*) rm "$_blob"; continue ;;
+
       # iPXE ROMs
       efi-*|pxe-*) continue ;;
 
       # core blobs
-      kvmvapic.bin|linuxboot*|multiboot.bin|sgabios.bin|vgabios*) continue ;;
+      bios-microvm.bin|kvmvapic.bin|linuxboot*|multiboot.bin|sgabios.bin|vgabios*) continue ;;
 
       # Trace events definitions
       trace-events*) continue ;;
-
-      # Logos
-      *.bmp|*.svg) continue ;;
     esac
 
     mv "$_blob" "$srcdir/extra-arch-$1/usr/share/qemu"
   done
+
+  # provided by edk2-ovmf package
+  rm -r firmware
+
+  cd ..
+  if [ "$1" = headless ]; then rm -r {applications,icons}; fi
 }
 
 package_qemu-arch-extra() {