diff --git a/virt-manager.changes b/virt-manager.changes
index 4e4fe5ca..8ec504e6 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun 13 16:48:17 MDT 2023 - carnold@suse.com
+
+- bsc#1212195 - libvirtd crashes when virt-manager connects
+  virt-manager qemu:///system on a fresh installation tumbleweed
+  virtman-check-for-libvirt-modular-daemons.patch
+- Changes to osinfo-db cause some virt-manager tests to fail.
+  virtman-fix-osinfo-tests.patch
+
 -------------------------------------------------------------------
 Tue Apr 25 06:14:10 MDT 2023 - carnold@suse.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index be15b25c..a3803ff4 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -102,6 +102,8 @@ Patch183:       virtinst-add-oracle-linux-support.patch
 Patch184:       virtinst-windows-server-detection.patch
 Patch185:       virtman-fix-shared-disk-request-alignment-error.patch
 Patch186:       virtman-language-fixes.patch
+Patch187:       virtman-check-for-libvirt-modular-daemons.patch
+Patch188:       virtman-fix-osinfo-tests.patch
 
 BuildArch:      noarch
 
diff --git a/virtman-check-for-libvirt-modular-daemons.patch b/virtman-check-for-libvirt-modular-daemons.patch
new file mode 100644
index 00000000..35cdfa21
--- /dev/null
+++ b/virtman-check-for-libvirt-modular-daemons.patch
@@ -0,0 +1,16 @@
+References: bsc#1212195
+
+--- virt-manager-4.1.0/virtManager/lib/connectauth.py.orig	2023-06-13 16:34:55.683255450 -0600
++++ virt-manager-4.1.0/virtManager/lib/connectauth.py	2023-06-13 16:35:22.499256089 -0600
+@@ -206,6 +206,11 @@ def connect_error(conn, errmsg, tb, warn
+ def setup_first_uri(config, tryuri):
+     # Add /usr/sbin to the path in case non-root user launches virt-manager
+     libvirtd_installed = bool(shutil.which("libvirtd", path=os.environ['PATH'] + os.pathsep + "/usr/sbin"))
++    # Check for new modular libvirt daemons
++    if libvirtd_installed is False:
++        libvirtd_installed = bool(shutil.which("virtqemud", path=os.environ['PATH'] + os.pathsep + "/usr/sbin"))
++    if libvirtd_installed is False:
++        libvirtd_installed = bool(shutil.which("virtxend", path=os.environ['PATH'] + os.pathsep + "/usr/sbin"))
+     if config.CLITestOptions.fake_no_libvirtd:
+         libvirtd_installed = False
+ 
diff --git a/virtman-fix-osinfo-tests.patch b/virtman-fix-osinfo-tests.patch
new file mode 100644
index 00000000..fc396511
--- /dev/null
+++ b/virtman-fix-osinfo-tests.patch
@@ -0,0 +1,46 @@
+# Fix tests
+
+--- virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url.xml.orig	2023-06-14 10:38:08.152804131 -0600
++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url.xml	2023-06-14 10:41:32.756809007 -0600
+@@ -13,7 +13,7 @@
+     <type arch="x86_64" machine="q35">hvm</type>
+     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+-    <cmdline>method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++    <cmdline>method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+   </os>
+   <features>
+     <acpi/>
+--- virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml.orig	2023-06-14 10:38:14.424804281 -0600
++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml	2023-06-14 10:40:27.748807458 -0600
+@@ -13,7 +13,7 @@
+     <type arch="x86_64" machine="q35">hvm</type>
+     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+-    <cmdline>method=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++    <cmdline>method=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+   </os>
+   <features>
+     <acpi/>
+--- virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml.orig	2023-06-14 10:38:24.920804531 -0600
++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml	2023-06-14 10:40:11.028807059 -0600
+@@ -13,7 +13,7 @@
+     <type arch="x86_64" machine="q35">hvm</type>
+     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+-    <cmdline>ks=file:/fedora.ks inst.repo=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
++    <cmdline>ks=file:/fedora.ks inst.repo=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/Server/x86_64/os/</cmdline>
+   </os>
+   <features>
+     <acpi/>
+--- virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml.orig	2023-06-14 10:39:35.908806222 -0600
++++ virt-manager-4.1.0/tests/data/cli/compare/virt-install-osinfo-unattended-treeapis.xml	2023-06-14 10:39:52.756806624 -0600
+@@ -13,7 +13,7 @@
+     <type arch="x86_64" machine="pc-i440fx-6.1">hvm</type>
+     <kernel>/VIRTINST-TESTSUITE/vmlinuz</kernel>
+     <initrd>/VIRTINST-TESTSUITE/initrd.img</initrd>
+-    <cmdline>ks=file:/fedora.ks method=http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
++    <cmdline>ks=file:/fedora.ks method=https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</cmdline>
+   </os>
+   <features>
+     <acpi/>