diff --git a/.gitignore b/.gitignore
index 2a55671..4647769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /tilix-1.9.3.tar.gz
 /tilix-1.9.4.tar.gz
 /tilix-1.9.5.tar.gz
+/undeaD-1.1.8.tar.gz
diff --git a/sources b/sources
index a6e3c76..8dc95b7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (tilix-1.9.5.tar.gz) = c44872f68f27f4001e145da7a18109131fb681f3c73118d3c89a7a4ffe3279d7fed6d1304bdc090a4ea21e70bbe6ec3ad2c1da8f5b2f3be94ba6fbf0431fc404
+SHA512 (undeaD-1.1.8.tar.gz) = c122d968ff89e3ddf84af4bbab418ed4e98a75863ea4f0f58661aa06145232718c7e43bc5db5cd0d5e1cf56ce5ebb6be8ef8e595b69cdde8f3387d2f3203bbaa
diff --git a/tilix.spec b/tilix.spec
index 8c3dac3..667feb4 100644
--- a/tilix.spec
+++ b/tilix.spec
@@ -10,7 +10,7 @@
 
 Name:           tilix
 Version:        1.9.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Tiling terminal emulator
 
 # The tilix source code is MPL-2.0,
@@ -24,10 +24,16 @@ Summary:        Tiling terminal emulator
 License:        MPL-2.0 AND GPL-2.0-or-later AND LGPL-3.0-or-later AND LGPL-3.0-only AND GPL-3.0-or-later AND (LGPL-3.0-or-later OR CC-BY-SA-3.0)
 URL:            https://github.com/gnunn1/tilix
 Source0:        https://github.com/gnunn1/tilix/archive/%{version}/%{name}-%{version}.tar.gz
+%global bundled_undeaD_version 1.1.8
+Source1:        https://github.com/dlang/undeaD/archive/refs/tags/v%{bundled_undeaD_version}/undeaD-%{bundled_undeaD_version}.tar.gz
 
 # Fix compatibility with Nautilus 43
 # https://github.com/gnunn1/tilix/pull/2115
 Patch:          2115.patch
+# Fix the build with ldc 1.31+ that removed xml from std
+# https://github.com/gnunn1/tilix/issues/2151
+# Patch from https://github.com/archlinux/svntogit-community/tree/master/tilix/trunk
+Patch:          undeaD-xml.patch
 
 ExclusiveArch:  %{ldc_arches}
 
@@ -56,6 +62,8 @@ Requires:       gtkd%{?_isa} >= %{gtkd_version}
 Obsoletes:      terminix < 1.5.4
 Provides:       terminix = %{version}-%{release}
 
+Provides:       bundled(undeaD) = %{bundled_undeaD_version}
+
 %description
 Tilix is a tiling terminal emulator with the following features:
 
@@ -92,6 +100,7 @@ option to the right-click context menu in Nautilus.
 
 %prep
 %autosetup -p1
+%autosetup -p1 -D -a 1
 
 %if 0%{?flatpak}
 sed -i -e "/^Exec=/ s|/usr/bin|%{_bindir}|" data/dbus/com.gexperts.Tilix.service
@@ -150,6 +159,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/com.gexperts.Tilix
 
 
 %changelog
+* Wed Mar 15 2023 Kalev Lember <klember@redhat.com> - 1.9.5-9
+- Switch to undeaD xml library
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/undeaD-xml.patch b/undeaD-xml.patch
new file mode 100644
index 0000000..4ab262b
--- /dev/null
+++ b/undeaD-xml.patch
@@ -0,0 +1,34 @@
+diff --git a/meson.build b/meson.build
+index 79981a96..c7e9cc34 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,7 +7,7 @@ project(
+ 
+ compiler = meson.get_compiler('d')
+ if compiler.get_id() == 'llvm'
+-  d_extra_args = ['-vcolumns']
++  d_extra_args = ['-vcolumns', '-I=../undeaD-1.1.8/src']
+   d_link_args = []
+ else
+   d_extra_args = []
+@@ -29,6 +29,7 @@ iconsdir = datadir / 'icons' / 'hicolor'
+ appdir = datadir / 'applications'
+ 
+ tilix_sources = [
++    'undeaD-1.1.8/src/undead/xml.d',
+     'source/gx/gtk/actions.d',
+     'source/gx/gtk/cairo.d',
+     'source/gx/gtk/clipboard.d',
+diff --git a/source/gx/tilix/prefeditor/prefdialog.d b/source/gx/tilix/prefeditor/prefdialog.d
+index a5c3ce37..9b94042f 100644
+--- a/source/gx/tilix/prefeditor/prefdialog.d
++++ b/source/gx/tilix/prefeditor/prefdialog.d
+@@ -957,7 +957,7 @@ private:
+             return;
+         }
+ 
+-        import std.xml: DocumentParser, ElementParser, Element, XMLException;
++        import undead.xml: DocumentParser, ElementParser, Element, XMLException;
+ 
+         try {
+             DocumentParser parser = new DocumentParser(ui);