diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index 27e0521f588..9c6ece74ffd 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -1,4 +1,6 @@
-PACKAGE=lib${LIB}
+PACKAGE=	xz
+LIB_PACKAGE=
+
 LIB=		lzma
 LZMADIR=	${SRCTOP}/contrib/xz/src/liblzma
 
diff --git a/release/packages/ucl/liblzma-all.ucl b/release/packages/ucl/xz-all.ucl
similarity index 78%
rename from release/packages/ucl/liblzma-all.ucl
rename to release/packages/ucl/xz-all.ucl
index d5698d48332..16da8b76f0a 100644
--- a/release/packages/ucl/liblzma-all.ucl
+++ b/release/packages/ucl/xz-all.ucl
@@ -16,11 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-comment = "XZ LZMA library"
+comment = "LZMA2 data compression"
 
 desc = <<EOD
-liblzma allows applications to compress and decompress data using the XZ
-compression algorithm.
+xz compresses data using the LZMA2 data compression algorithm.  This package
+provides the front-end xz(1) utility, and the liblzma library which allows
+applications to use this functionality programatically.
 EOD
 
 annotations {
diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile
index afde07163a0..e537e4c8608 100644
--- a/usr.bin/lzmainfo/Makefile
+++ b/usr.bin/lzmainfo/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=xz
+
 PROG=	lzmainfo
 
 XZDIR=	${SRCTOP}/contrib/xz/src
diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
index 0d5bce4c16f..0a9103d60a1 100644
--- a/usr.bin/xz/Makefile
+++ b/usr.bin/xz/Makefile
@@ -1,5 +1,7 @@
 .include <src.opts.mk>
 
+PACKAGE=xz
+
 PROG=	xz
 
 LINKS=	${BINDIR}/xz ${BINDIR}/unxz
diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile
index 7c43b2e03d7..6bf3dc07a40 100644
--- a/usr.bin/xzdec/Makefile
+++ b/usr.bin/xzdec/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=xz
+
 PROG=	xzdec
 
 LINKS=	${BINDIR}/xzdec ${BINDIR}/lzdec