diff --git a/libvirt.changes b/libvirt.changes
index fd23f5e..79cfa1a 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Oct 16 08:51:24 UTC 2015 - cbosdonnat@suse.com
+
+- spec: remove all dependencies on apparmor to keep it optional.
+  bsc#949793
+
+-------------------------------------------------------------------
+Tue Oct 13 15:13:38 UTC 2015 - jfehlig@suse.com
+
+- xenconfig: set disk type to BLOCK when driver is not tap or file
+  xen-sxpr-disk-type.patch
+  bsc#938228
+
 -------------------------------------------------------------------
 Fri Oct  9 17:11:14 UTC 2015 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index 6b17211..1f209fb 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -461,11 +461,12 @@ Patch203:       virtlockd-init-script.patch
 Patch204:       suse-qemu-conf.patch
 Patch205:       support-managed-pci-xen-driver.patch
 Patch206:       systemd-service-xen.patch
+Patch207:       xen-sxpr-disk-type.patch
 # Disable failing virCgroupGetPercpuStats unit test
-Patch207:       disable-virCgroupGetPercpuStats-test.patch
-Patch208:       apparmor-no-mount.patch
-Patch209:       qemu-apparmor-screenshot.patch
-Patch210:       libvirt-suse-netcontrol.patch
+Patch208:       disable-virCgroupGetPercpuStats-test.patch
+Patch209:       apparmor-no-mount.patch
+Patch210:       qemu-apparmor-screenshot.patch
+Patch211:       libvirt-suse-netcontrol.patch
 # SocketUser and SocketGroup settings were added to systemd.socket in
 # version 214.  Patch the setting away in earlier systemd
 %if 0%{systemd_version} < 214
@@ -515,10 +516,6 @@ Requires:       modutils
 Requires:       bridge-utils
 Requires:       iproute
 Requires:       logrotate
-    %if %{with_apparmor}
-Requires:       apparmor-parser
-Requires:       apparmor-profiles
-    %endif
 
     %if %{with_udev}
 Requires:       udev >= 145
@@ -993,6 +990,7 @@ Provides a dissector for the libvirt RPC protocol to help debugging it.
 %patch208 -p1
 %patch209 -p1
 %patch210 -p1
+%patch211 -p1
 %if 0%{systemd_version} < 214
 %patch300 -p1
 %endif
diff --git a/xen-sxpr-disk-type.patch b/xen-sxpr-disk-type.patch
new file mode 100644
index 0000000..3a8cd39
--- /dev/null
+++ b/xen-sxpr-disk-type.patch
@@ -0,0 +1,26 @@
+xen_sxpr: set disk type to BLOCK when driver is not tap or file
+
+When parsing disk s-expression to virDomainDiskDef structure, explicitly
+set type to VIR_STORAGE_TYPE_BLOCK for all drivers except 'tap', 'tap2',
+and 'file'. This was implicitly done prior to commit 9673418c.
+
+https://bugzilla.suse.com/show_bug.cgi?id=938228
+
+Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+===================================================================
+--- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+@@ -449,10 +449,11 @@ xenParseSxprDisks(virDomainDefPtr def,
+                        omnipotent, we can revisit this, perhaps stat()'ing
+                        the src file in question */
+                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
+-                } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) {
+-                    virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
+                 } else if (STREQ(virDomainDiskGetDriver(disk), "file")) {
+                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
++                } else {
++                    /* Set type to BLOCK for drivers != {tap,tap2,file} */
++                    virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
+                 }
+             } else {
+                 /* No CDROM media so can't really tell. We'll just