diff --git a/ports/ag/ag.port b/ports/ag/ag.port
index fb8b23a5..04aacc05 100644
--- a/ports/ag/ag.port
+++ b/ports/ag/ag.port
@@ -1,5 +1,5 @@
 NAME=ag
-BUILD_LIBRARIES='libpcre libz xz'
+BUILD_LIBRARIES='libpcre libz liblzma'
 VERSION=0.33.0
 DISTNAME=the_silver_searcher-$VERSION
 COMPRESSION=tar.gz
diff --git a/ports/grub/grub.port b/ports/grub/grub.port
index e9df4c55..957735ed 100644
--- a/ports/grub/grub.port
+++ b/ports/grub/grub.port
@@ -1,5 +1,5 @@
 NAME=grub
-BUILD_LIBRARIES='libiconv? libintl? libfreetype? xz?'
+BUILD_LIBRARIES='libiconv? libintl? libfreetype? liblzma?'
 VERSION=1.0-rc1
 DISTNAME=sortix-grub-$VERSION
 COMPRESSION=tar.gz
diff --git a/ports/libavcodec/libavcodec.port b/ports/libavcodec/libavcodec.port
index 228117ab..92ba46de 100644
--- a/ports/libavcodec/libavcodec.port
+++ b/ports/libavcodec/libavcodec.port
@@ -1,6 +1,6 @@
 NAME=libavcodec
 SOURCE_PORT=ffmpeg
-BUILD_LIBRARIES='libfontconfig? libfreetype? libiconv? libssl? libtheora? libvorbis? libxml2? libz? xz?'
+BUILD_LIBRARIES='libfontconfig? libfreetype? libiconv? liblzma? libssl? libtheora? libvorbis? libxml2? libz?'
 BUILD_SYSTEM=configure
 DIRTY_FILE=ffbuild/config.mak
 CONFIGURE_ARGS='--disable-x86asm --enable-version3 --optflags=" " --disable-debug --disable-programs'
diff --git a/ports/libglib/libglib.port b/ports/libglib/libglib.port
index d7af45ba..6e631372 100644
--- a/ports/libglib/libglib.port
+++ b/ports/libglib/libglib.port
@@ -1,5 +1,5 @@
 NAME=libglib
-BUILD_LIBRARIES='libiconv libintl libz libffi xz? libdbus?'
+BUILD_LIBRARIES='libiconv libintl libz libffi liblzma? libdbus?'
 VERSION=2.45.6
 DISTNAME=glib-$VERSION
 COMPRESSION=tar.xz
diff --git a/ports/liblzma/liblzma.port b/ports/liblzma/liblzma.port
new file mode 100644
index 00000000..61d783ff
--- /dev/null
+++ b/ports/liblzma/liblzma.port
@@ -0,0 +1,6 @@
+NAME=liblzma
+BUILD_LIBRARIES='libiconv? libintl?'
+SOURCE_PORT=xz
+BUILD_SYSTEM=configure
+CONFIGURE_ARGS='--disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-xz --disable-xzdec --disable-scripts --disable-doc'
+POST_INSTALL=tix-eradicate-libtool-la
diff --git a/ports/python/python.port b/ports/python/python.port
index 8f370141..45f2e087 100644
--- a/ports/python/python.port
+++ b/ports/python/python.port
@@ -1,5 +1,5 @@
 NAME=python
-BUILD_LIBRARIES='bzip2 libcurses libexpat libffi libreadline libssl libz xz libiconv? libintl? llibmpdec?'
+BUILD_LIBRARIES='bzip2 libcurses libexpat libffi libreadline libssl libz liblzma libiconv? libintl? llibmpdec?'
 VERSION=3.6.0
 DISTNAME=Python-$VERSION
 COMPRESSION=tar.xz
diff --git a/ports/xz/xz.patch b/ports/xz/xz.patch
index 20c4182d..4887d3cc 100644
--- a/ports/xz/xz.patch
+++ b/ports/xz/xz.patch
@@ -1,30 +1,18 @@
-diff -Paur --no-dereference -- xz.upstream/build-aux/config.sub xz/build-aux/config.sub
---- xz.upstream/build-aux/config.sub
-+++ xz/build-aux/config.sub
-@@ -1373,7 +1373,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 diff -Paur --no-dereference -- xz.upstream/configure xz/configure
 --- xz.upstream/configure
 +++ xz/configure
-@@ -18313,6 +18313,7 @@
+@@ -19269,6 +19269,7 @@
  
  #if defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) \
  		|| defined(__DJGPP__) || defined(__VMS) \
 +		|| defined(__sortix__) \
- 		|| defined(AMIGA) || defined(__AROS__)
+ 		|| defined(AMIGA) || defined(__AROS__) || defined(__QNX__)
  int main(void) { return 0; }
  #else
 diff -Paur --no-dereference -- xz.upstream/src/common/tuklib_physmem.c xz/src/common/tuklib_physmem.c
 --- xz.upstream/src/common/tuklib_physmem.c
 +++ xz/src/common/tuklib_physmem.c
-@@ -67,6 +67,11 @@
+@@ -70,6 +70,11 @@
  // This sysinfo() is Linux-specific.
  #elif defined(TUKLIB_PHYSMEM_SYSINFO)
  #	include <sys/sysinfo.h>
@@ -36,7 +24,7 @@ diff -Paur --no-dereference -- xz.upstream/src/common/tuklib_physmem.c xz/src/co
  #endif
  
  
-@@ -197,6 +202,10 @@
+@@ -210,6 +215,10 @@
  	struct sysinfo si;
  	if (sysinfo(&si) == 0)
  		ret = (uint64_t)si.totalram * si.mem_unit;
diff --git a/ports/xz/xz.port b/ports/xz/xz.port
index 92992795..3622c6bf 100644
--- a/ports/xz/xz.port
+++ b/ports/xz/xz.port
@@ -1,12 +1,12 @@
 NAME=xz
-BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=5.2.1
+BUILD_LIBRARIES='liblzma libiconv? libintl?'
+VERSION=5.2.5
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=6ecdd4d80b12001497df0741d6037f918d270fa0f9a1ab4e2664bf4157ae323c
+SHA256SUM=3e1e518ffc912f86608a8cb35e4bd41ad1aec210df2a47aaa1f95e7f5576ef56
 UPSTREAM_SITE=https://tukaani.org/xz
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS='--disable-lzmadec --disable-lzmainfo --disable-lzma-links'
-POST_INSTALL=tix-eradicate-libtool-la
+POST_INSTALL=../xz.post-install
diff --git a/ports/xz/xz.post-install b/ports/xz/xz.post-install
new file mode 100755
index 00000000..a67a45e9
--- /dev/null
+++ b/ports/xz/xz.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+cd "$TIX_INSTALL_DIR/$PREFIX"
+rm -rf include lib # Provided by liblzma