diff --git a/libvirt-9.4.0.tar.xz b/libvirt-9.4.0.tar.xz
deleted file mode 100644
index dac84f2..0000000
--- a/libvirt-9.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbded6ded68378a298b1c1bdae89ec4c166ee86749d0a97f9efa859055d5a7f1
-size 9592028
diff --git a/libvirt-9.5.0.tar.xz b/libvirt-9.5.0.tar.xz
new file mode 100644
index 0000000..3593527
--- /dev/null
+++ b/libvirt-9.5.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b71fd0cc27d69187996a068300d2fa1b7bd592cf18b7aa1137e802edae9e6d4
+size 9604852
diff --git a/libvirt-supportconfig b/libvirt-supportconfig
index 0ce12b5..02ccce8 100644
--- a/libvirt-supportconfig
+++ b/libvirt-supportconfig
@@ -3,7 +3,6 @@
 # Name:        Supportconfig Plugin for libvirt
 # Description: Gathers important troubleshooting information
 #              about libvirt
-# Author:      Jim Fehlig <jfehlig@suse.com>
 #############################################################
 
 RCFILE="/usr/lib/supportconfig/resources/scplugin.rc"
diff --git a/libvirt.changes b/libvirt.changes
index 78fea3b..f07c07b 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Jul 13 20:07:10 UTC 2023 - James Fehlig <jfehlig@suse.com>
+
+- libxl: Improve handling of errors across migration phases
+  bsc#1213186
+- apparmor: Support local overrides in all profiles and abstractions
+  spec: Don't replace /etc/apparmor.d/<profile> on package upgrade
+  spec: No longer package empty /etc/apparmor.d/local/* files
+  bsc#1211472
+
+-------------------------------------------------------------------
+Thu Jul  6 16:09:49 UTC 2023 - James Fehlig <jfehlig@suse.com>
+
+- Update to libvirt 9.5.0
+  - Many incremental improvements and bug fixes, see
+    https://libvirt.org/news.html#v9-5-0-2023-07-03
+  - Add upstream commit 5f7f6ceb47 to fix builds on Leap 15.x
+  - Drop downstream commit adding SUSE-specific migration
+    parameters
+
 -------------------------------------------------------------------
 Tue Jun 13 22:28:33 UTC 2023 - James Fehlig <jfehlig@suse.com>
 
diff --git a/libvirt.spec b/libvirt.spec
index 9d1d80d..d03c535 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -144,7 +144,7 @@
 
 Name:           libvirt
 URL:            https://libvirt.org/
-Version:        9.4.0
+Version:        9.5.0
 Release:        0
 Summary:        Library providing a virtualization API
 License:        LGPL-2.1-or-later
@@ -1079,7 +1079,6 @@ rm -f %{buildroot}/%{logrotate_dir}/libvirtd.lxc
 %if ! %{with_qemu}
 rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu.conf
 rm -f %{buildroot}/%{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
-rm -f %{buildroot}/%{_sysconfdir}/apparmor.d/local/usr.sbin.virtqemud
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_qemu.aug
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 rm -f %{buildroot}/%{logrotate_dir}/libvirtd.qemu
@@ -1087,7 +1086,6 @@ rm -f %{buildroot}/%{logrotate_dir}/libvirtd.qemu
 %if ! %{with_libxl}
 rm -f %{buildroot}/%{_sysconfdir}/%{name}/libxl.conf
 rm -f %{buildroot}/%{_sysconfdir}/apparmor.d/usr.sbin.virtxend
-rm -f %{buildroot}/%{_sysconfdir}/apparmor.d/local/usr.sbin.virtxend
 rm -f %{buildroot}/%{logrotate_dir}/libvirtd.libxl
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_libxl.aug
 rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
@@ -1499,8 +1497,7 @@ fi
 %{_sbindir}/rclibvirtd
 %config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf
 %if %{with_apparmor}
-%config %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
-%config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.libvirtd
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
 %endif
 %{logrotate_prefix} %{logrotate_dir}/libvirtd
 %dir %{_datadir}/augeas/
@@ -1544,13 +1541,11 @@ fi
 %dir %{_sysconfdir}/apparmor.d/
 %dir %{_sysconfdir}/apparmor.d/abstractions/
 %dir %{_sysconfdir}/apparmor.d/%{name}/
-%dir %{_sysconfdir}/apparmor.d/local/
-%config %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
-%config %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
-%config %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
-%config %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.lxc
-%config %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.qemu
-%config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
+%config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
+%config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
+%config(noreplace) %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.lxc
+%config(noreplace) %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.qemu
 %{_libexecdir}/virt-aa-helper
 %endif
 %dir %{_prefix}/lib/firewalld/
@@ -1759,8 +1754,7 @@ fi
 %files daemon-driver-qemu
 %config(noreplace) %{_sysconfdir}/%{name}/virtqemud.conf
 %if %{with_apparmor}
-%config %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
-%config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.virtqemud
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
 %endif
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
 %{_datadir}/augeas/lenses/virtqemud.aug
@@ -1824,8 +1818,7 @@ fi
 %files daemon-driver-libxl
 %config(noreplace) %{_sysconfdir}/%{name}/virtxend.conf
 %if %{with_apparmor}
-%config %{_sysconfdir}/apparmor.d/usr.sbin.virtxend
-%config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.virtxend
+%config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtxend
 %endif
 %{_datadir}/augeas/lenses/virtxend.aug
 %{_datadir}/augeas/lenses/tests/test_virtxend.aug