diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 317d9f0..9f9c1a6 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -47,3 +47,4 @@ a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e  perl-5.6.2.tar
 c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600  sed-4.0.9.tar.gz
 404a8d72427a559c074e581bf8f7d5a73283faf249cd3faf6dc1c6faf97d07c7  sha-2-61555d.tar.gz
 c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a  tar-1.12.tar.gz
+166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490  xz-5.0.5.tar.bz2
diff --git a/parts.rst b/parts.rst
index 9cf26ae..d59eae8 100644
--- a/parts.rst
+++ b/parts.rst
@@ -560,3 +560,10 @@ interactively.  This new version of ``bash`` compiles without any patches,
 provides new features, and is built with GNU readline support so it can be used
 as an interactive shell. ``autoconf-2.61`` is used to regenerate the configure
 script and ``bison`` is used to recreate some included generated files.
+
+xz 5.0.5
+========
+
+XZ Utils is a set of free software command-line lossless data compressors,
+including lzma and xz. In most cases, xz achieves higher compression rates
+than alternatives like gzip and bzip2.
diff --git a/rootfs.sh b/rootfs.sh
index 2acbc0f..9046bc0 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -258,15 +258,6 @@ get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.61.tar.bz2
 # automake 1.9.6
 get_file https://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2
 
-# gcc 4.0.4
-get_file https://ftp.gnu.org/gnu/gcc/gcc-4.0.4/gcc-core-4.0.4.tar.bz2 0 gcc-4.0.4.tar.bz2
-
-# musl 1.2.2
-get_file https://musl.libc.org/releases/musl-1.2.2.tar.gz
-
-# bash 5.1
-get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz
-
 # findutils 4.2.33
 get_file https://ftp.gnu.org/gnu/findutils/findutils-4.2.33.tar.gz
 
@@ -279,6 +270,18 @@ get_file https://ftp.gnu.org/gnu/automake/automake-1.10.3.tar.bz2
 # autoconf 2.65
 get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.65.tar.bz2
 
+# gcc 4.0.4
+get_file https://ftp.gnu.org/gnu/gcc/gcc-4.0.4/gcc-core-4.0.4.tar.bz2 0 gcc-4.0.4.tar.bz2
+
+# musl 1.2.2
+get_file https://musl.libc.org/releases/musl-1.2.2.tar.gz
+
+# bash 5.1
+get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz
+
+# xz 5.0.5
+get_file https://tukaani.org/xz/xz-5.0.5.tar.bz2
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/run2.sh b/sysa/run2.sh
index b63c38a..e2efec2 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -10,6 +10,8 @@ set -e
 
 . helpers.sh
 
+build xz-5.0.5
+
 echo "Bootstrapping completed."
 
 exec env - PATH=/after/bin PS1="\w # " bash -i
diff --git a/sysa/xz-5.0.5/checksums b/sysa/xz-5.0.5/checksums
new file mode 100644
index 0000000..e2cd02a
--- /dev/null
+++ b/sysa/xz-5.0.5/checksums
@@ -0,0 +1,10 @@
+4059df79a032a49e91f93a74a69695b63fdbf8bca07a3db694a11e55306f68cb  /after/bin/lzmadec
+5d659d1117c86e8e4c3a9008c6864fb2b9fe1957e88744212bf18881117cb650  /after/bin/lzmainfo
+324136feea5a7c5b4d618ad098c3cd80233aa45077d6a1de54608683b5ee2268  /after/bin/xz
+79eedbc8cce14e5a9baf71a9b81c7ab3c0fa24e28ff32067b2ee0bd72492583b  /after/bin/xzdec
+104548a69cb9ced78dd4fd08f5e8a1b6b07230ada5e6554a07368ed84191da86  /after/bin/xzdiff
+34db9e45f4ca4bc96b8280ac438ac6c4fab95e44e812e20cf86a2248bf2f7579  /after/bin/xzgrep
+2ce262d47007d17dc668e9a9a3263f7fe3f145d61971f189c21f59b25498a4e3  /after/bin/xzless
+a050699ff5484e063154d11bf05a9a4eb6c2d38bac09a975a96b42c8b45a72ef  /after/bin/xzmore
+6a75c21815666ea72ee0cace326edddf04840096425da2a8936bccc026233292  /after/lib/liblzma.a
+7691b11f60a825f9556bc213997a011400ae06a812d02f67b39438b8bdba8212  /after/lib/liblzma.la
diff --git a/sysa/xz-5.0.5/patches/xz_automake.patch b/sysa/xz-5.0.5/patches/xz_automake.patch
new file mode 100644
index 0000000..5db0e50
--- /dev/null
+++ b/sysa/xz-5.0.5/patches/xz_automake.patch
@@ -0,0 +1,19 @@
+SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+
+SPDX-License-Identifier: Unlicense
+
+Build with Automake 1.10
+
+--- configure.ac	2021-03-25 21:25:45.309736487 +0000
++++ configure.ac	2021-03-25 21:28:06.683426486 +0000
+@@ -417,8 +417,8 @@
+ echo "Initializing Automake:"
+ 
+ # Automake 1.10 should still be enough but you need to omit serial-tests.
+-dnl AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99])
+-AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests])
++AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99])
++dnl AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests])
+ AC_PROG_LN_S
+ 
+ AC_PROG_CC_C99
diff --git a/sysa/xz-5.0.5/xz-5.0.5.sh b/sysa/xz-5.0.5/xz-5.0.5.sh
new file mode 100755
index 0000000..1efabb6
--- /dev/null
+++ b/sysa/xz-5.0.5/xz-5.0.5.sh
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default_src_prepare
+
+    autoreconf-2.65 -f
+}
+
+src_configure() {
+    ./configure \
+        --prefix="${PREFIX}" \
+        --disable-shared \
+        --target=i386-unknown-linux-gnu \
+        --host=i386-unknown-linux-gnu \
+        --build=i386-unknown-linux-gnu
+}