Index: PKGBUILD
===================================================================
--- PKGBUILD	(revision 382203)
+++ PKGBUILD	(working copy)
@@ -158,18 +158,19 @@
       -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
     install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
       -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+
+    # ... and secboot couterpart
+    install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF.fd" \
+      "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF.secboot.fd"
     install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
       "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
-    # adding symlinks for previous ovmf location (only secure boot was provided as the default)
-    # https://bugs.archlinux.org/task/66322
-    install -vdm 755 "${pkgdir}/usr/share/ovmf/${_arch,,}"
-    ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd" \
-      "${pkgdir}/usr/share/ovmf/${_arch,,}/OVMF_CODE.fd"
-    ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF_VARS.fd" \
-      "${pkgdir}/usr/share/ovmf/${_arch,,}/OVMF_VARS.fd"
-    ln -sfv "/usr/share/${pkgname}/${_arch,,}/OVMF.fd" \
-      "${pkgdir}/usr/share/ovmf/${_arch,,}/OVMF.fd"
+    install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
+      "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_VARS.secboot.fd"
   done
+
+  # adding symlink for previous ovmf location                                                
+  ln -sfv "/usr/share/${pkgname}" "${pkgdir}/usr/share/ovmf"
+
   # installing qemu descriptors in accordance with qemu:
   # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
   # https://bugs.archlinux.org/task/64206