diff --git a/distrib/notes/Makefile.inc b/distrib/notes/Makefile.inc
index 2bc01f811160..f066b9578b66 100644
--- a/distrib/notes/Makefile.inc
+++ b/distrib/notes/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.55 2020/06/16 00:45:56 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.56 2020/06/23 06:28:01 martin Exp $
 #
 
 # Ross Harvey <ross@NetBSD.org>
@@ -36,8 +36,10 @@ PRESET=	${GFLAGS} -U -dM=${M} -dV=${DISTRIBVER} -d.CURDIR=${.CURDIR} -r${M}=1
 PRESET+=	-rmajor=${DISTRIBVER:C/\..*$//}
 .if ${USE_XZ_SETS:Uno} == "yes"
 PRESET+=	-dsetsuffix=tar.xz
+PRESET+=	-dcompressor=xz
 .else
 PRESET+=	-dsetsuffix=tgz
+PRESET+=	-dcompressor=gzip
 .endif
 .if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
 PRESET+=	-rFOR_RELEASE=1
diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index ceb8d374eb72..1437311e46d1 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.21 2020/06/22 12:03:46 maya Exp $
+.\"	$NetBSD: contents,v 1.22 2020/06/23 06:28:02 martin Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -309,7 +309,9 @@ The X server.
 .\" XXX: should be in notes/common
 .
 .Pp
-The \*M binary distribution sets are distributed as xzipped tar files
+The \*M binary distribution sets are distributed as tar files
+compressed with
+.Sy \*[compressor]
 named with the extension
 .Sy .\*[setsuffix] ,
 e.g.
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index b6877c3a4b70..bdd736000098 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.10 2020/06/22 12:03:47 maya Exp $
+.\"	$NetBSD: contents,v 1.11 2020/06/23 06:28:02 martin Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -245,7 +245,9 @@ This includes the modular X.Org server.
 .\"
 .
 .Pp
-The \*M binary distribution sets are distributed as xzipped tar files
+The \*M binary distribution sets are distributed as tar files
+compressed with
+.Sy \*[compressor]
 named with the extension
 .Sy .\*[setsuffix]
 .Pq e.g., Pa base.\*[setsuffix] .
diff --git a/distrib/notes/common/contents b/distrib/notes/common/contents
index 50966e4a72b5..2e6ac32ab82c 100644
--- a/distrib/notes/common/contents
+++ b/distrib/notes/common/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.180 2019/11/24 11:15:33 martin Exp $
+.\"	$NetBSD: contents,v 1.181 2020/06/23 06:28:02 martin Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -965,7 +965,9 @@ servers with man pages and the runtime configuration file.
 .
 .
 .Pp
-The \*M binary distribution sets are distributed as gzipped tar files
+The \*M binary distribution sets are distributed as tar files
+compressed with
+.Sy \*[compressor]
 named with the extension
 .Sy .\*[setsuffix] ,
 e.g.
diff --git a/distrib/notes/evbarm/contents b/distrib/notes/evbarm/contents
index 522466d74f04..7f37d0c972c6 100644
--- a/distrib/notes/evbarm/contents
+++ b/distrib/notes/evbarm/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.7 2020/06/22 12:03:47 maya Exp $
+.\"	$NetBSD: contents,v 1.8 2020/06/23 06:28:02 martin Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -259,8 +259,10 @@ The X server.
 .\" XXX: should be in notes/common
 .
 .Pp
-The \*M binary distribution sets are distributed as gzipped or xzipped
-tar files named with the extension
+The \*M binary distribution sets are distributed as tar files
+compressed with
+.Sy \*[compressor]
+named with the extension
 .Sy .\*[setsuffix] ,
 e.g.
 .Pa base.\*[setsuffix] .
diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index e4741585b111..40006b2e4ffc 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.10 2020/06/22 12:03:47 maya Exp $
+.\"	$NetBSD: contents,v 1.11 2020/06/23 06:28:02 martin Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -295,7 +295,9 @@ This includes the modular Xorg and Xvfb servers.
 .\" XXX: should be in notes/common
 .
 .Pp
-The \*M binary distribution sets are distributed as xzipped tar files
+The \*M binary distribution sets are distributed as tar files
+compressed with
+.Sy \*[compressor]
 named with the extension
 .Sy .\*[setsuffix] ,
 e.g.,