diff --git a/virt-manager.changes b/virt-manager.changes
index 8e84e6df..9fe2c395 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 14 16:08:05 MDT 2016 - carnold@suse.com
+
+- boo#981836 - virt-manager does not support all boot methods for
+  AArch64
+  virtinst-support-other-boot-methods.patch
+
 -------------------------------------------------------------------
 Tue Jun  7 14:18:32 MDT 2016 - carnold@suse.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 6527bbde..7508c1aa 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -81,6 +81,7 @@ Patch162:       virtinst-refresh_before_fetch_pool.patch
 Patch163:       virtinst-fix-sle12sp1-detection.patch
 Patch164:       virtinst-fix-tumbleweed-detection.patch
 Patch165:       virtinst-use-xenpae-kernel-for-32bit.patch
+Patch166:       virtinst-support-other-boot-methods.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -206,6 +207,7 @@ machine).
 %patch163 -p1
 %patch164 -p1
 %patch165 -p1
+%patch166 -p1
 
 %build
 %if %{qemu_user}
diff --git a/virtinst-support-other-boot-methods.patch b/virtinst-support-other-boot-methods.patch
new file mode 100644
index 00000000..887c60fa
--- /dev/null
+++ b/virtinst-support-other-boot-methods.patch
@@ -0,0 +1,43 @@
+References: boo#981836
+Tell libvirt what machine type the user chose for Xen (PV or HVM).
+Without a type specified, the default is to return the capabilities of a pv
+machine. This will allow the UEFI Customize option to show up when Xen HVM
+is selected. Also specify the name of our aavmf firmware for aarch64.
+--- virt-manager-1.3.2/virtinst/domcapabilities.py.orig	2016-06-14 16:08:52.000000000 -0600
++++ virt-manager-1.3.2/virtinst/domcapabilities.py	2016-06-14 16:10:41.000000000 -0600
+@@ -73,10 +73,17 @@ class _Devices(_CapsBlock):
+ 
+ class DomainCapabilities(XMLBuilder):
+     @staticmethod
+-    def build_from_params(conn, emulator, arch, machine, hvtype):
++    def build_from_params(conn, emulator, arch, machine, hvtype, os_type):
+         xml = None
+         if conn.check_support(
+             conn.SUPPORT_CONN_DOMAIN_CAPABILITIES):
++            machine_type = machine
++            # For Xen capabilities pass either xenpv or xenfv
++            if hvtype == 'xen':
++                if os_type == "hvm":
++                    machine_type = "xenfv"
++                else:
++                    machine_type = "xenpv"
+             try:
+                 xml = conn.getDomainCapabilities(emulator, arch,
+                     machine, hvtype)
+@@ -92,7 +99,7 @@ class DomainCapabilities(XMLBuilder):
+     @staticmethod
+     def build_from_guest(guest):
+         return DomainCapabilities.build_from_params(guest.conn,
+-            guest.emulator, guest.os.arch, guest.os.machine, guest.type)
++            guest.emulator, guest.os.arch, guest.os.machine, guest.type, guest.os.os_type)
+ 
+     # Mapping of UEFI binary names to their associated architectures. We
+     # only use this info to do things automagically for the user, it shouldn't
+@@ -106,6 +113,7 @@ class DomainCapabilities(XMLBuilder):
+         "aarch64": [
+             ".*AAVMF_CODE\.fd",  # RHEL
+             ".*aarch64/QEMU_EFI.*",  # gerd's firmware repo
++            ".*aavmf-aarch64-.*"  # SUSE
+         ],
+     }
+