diff --git a/distrib/alpha/instkernel/ramdisk/list b/distrib/alpha/instkernel/ramdisk/list
index 57921277edb0..4489e796c3b5 100644
--- a/distrib/alpha/instkernel/ramdisk/list
+++ b/distrib/alpha/instkernel/ramdisk/list
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.45 2014/08/02 19:35:13 martin Exp $
+#	$NetBSD: list,v 1.46 2018/10/01 17:50:08 martin Exp $
 
 SRCDIRS	bin sbin external/bsd/less/bin usr.bin usr.sbin
 
@@ -61,7 +61,7 @@ ARGVLN	sh -sh
 SPECIAL	gzip		srcdir	distrib/utils/x_gzip
 SPECIAL	ping		srcdir	distrib/utils/x_ping
 
-LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
 
 # we need the boot blocks /usr/mdec
 COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
diff --git a/distrib/amd64/ramdisks/common/list.ramdisk b/distrib/amd64/ramdisks/common/list.ramdisk
index d65f6c968541..e8adb726c119 100644
--- a/distrib/amd64/ramdisks/common/list.ramdisk
+++ b/distrib/amd64/ramdisks/common/list.ramdisk
@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.20 2015/10/07 14:09:04 martin Exp $
+#	$NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
 
 SRCDIRS	external/bsd/less/bin
 SRCDIRS	bin sbin usr.bin usr.sbin libexec
@@ -66,7 +66,7 @@ SPECIAL	route		srcdir	distrib/utils/x_route
 ARGVLN	sh -sh
 
 # libhack.o is built by Makefile & included Makefile.inc
-LIBS	libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS	libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
diff --git a/distrib/sparc64/instfs/list b/distrib/sparc64/instfs/list
index 224992dacc0c..8163f8776e54 100644
--- a/distrib/sparc64/instfs/list
+++ b/distrib/sparc64/instfs/list
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.27 2018/09/28 15:05:23 martin Exp $
+#	$NetBSD: list,v 1.28 2018/10/01 17:50:08 martin Exp $
 
 SRCDIRS	bin sbin libexec external/bsd/less/bin usr.bin usr.sbin
 
@@ -79,7 +79,7 @@ SPECIAL	route		srcdir	distrib/utils/x_route
 # SPECIAL	xz		srcdir	external/public-domain/xz/bin
 
 LIBS	libhack.o
-LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -lprop
+LIBS	-ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -llzma -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
diff --git a/distrib/utils/x_gzip/Makefile b/distrib/utils/x_gzip/Makefile
index 8634cdd30a0b..bd45ef952c75 100644
--- a/distrib/utils/x_gzip/Makefile
+++ b/distrib/utils/x_gzip/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2011/06/19 01:25:35 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.9 2018/10/01 17:50:08 martin Exp $
 # Build a tiny limited gzip (i.e. for tiny boot media)
 
 SRCDIR=         ${.CURDIR}/../../../usr.bin/gzip
@@ -10,10 +10,12 @@ CPPFLAGS+=	-DSMALL
 CPPFLAGS+=	-DNO_BZIP2_SUPPORT
 CPPFLAGS+=	-DNO_COMPRESS_SUPPORT
 CPPFLAGS+=	-DNO_PACK_SUPPORT
-CPPFLAGS+=	-DNO_XZ_SUPPORT
+CPPFLAGS+=	${"${USE_XZ_SETS:Uno}"!="no":?:-DNO_XZ_SUPPORT}
 
-DPADD=		${LIBZ}
-LDADD=		-lz
+# for crunched binaries this does not take effect, also check the
+# LIBS entry in the lists file
+DPADD=		${LIBZ} ${LIBLZMA}
+LDADD=		-lz -llzma
 
 .include <bsd.prog.mk>