24 files changed, 26 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 531496c2..26e0588d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,5 +12,5 @@
 ##  Lesser General Public License for more details.
 ##
 
-SUBDIRS = liblzma lzma lzmadec scripts
+SUBDIRS = liblzma xz xzdec scripts
 EXTRA_DIST = common
diff --git a/src/lzma/Makefile.am b/src/xz/Makefile.am
index e5c5c29a..16e55461 100644
--- a/src/lzma/Makefile.am
+++ b/src/xz/Makefile.am
@@ -12,9 +12,9 @@
 ##  Lesser General Public License for more details.
 ##
 
-bin_PROGRAMS = lzma
+bin_PROGRAMS = xz
 
-lzma_SOURCES = \
+xz_SOURCES = \
 	args.c \
 	args.h \
 	hardware.c \
@@ -35,38 +35,40 @@ lzma_SOURCES = \
 	util.c \
 	util.h
 
-## It must be able to find sysdefs.h, lzma_adv.h, and possible
-## replacement headers.
-lzma_CPPFLAGS = \
+xz_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-I@top_srcdir@/src/common \
 	-I@top_srcdir@/src/liblzma/api \
 	-I@top_builddir@/lib \
 	-I@top_srcdir@/lib
 
-lzma_CFLAGS = @PTHREAD_CFLAGS@
+xz_CFLAGS = @PTHREAD_CFLAGS@
 
 ## Always link the command line tool statically against liblzma. It is
 ## faster on x86, because no need for PIC. We also have one dependency less,
-## which allows users to more freely copy the lzma binary to other boxes.
-lzma_LDFLAGS = -static
-lzma_LDADD = \
+## which allows users to more freely copy the xz binary to other boxes.
+xz_LDFLAGS = -static
+xz_LDADD = \
 	@top_builddir@/src/liblzma/liblzma.la \
 	@LTLIBINTL@ \
 	@PTHREAD_LIBS@
 
 if COND_GNULIB
-lzma_LDADD += @top_builddir@/lib/libgnu.a
+xz_LDADD += @top_builddir@/lib/libgnu.a
 endif
 
 
-## Create symlinks for unlzma and lzcat:
+## Create symlinks for unxz and xzcat for convenicen. Create symlinks also
+## for lzma, unlzma, and lzcat for compatibility with LZMA Utils 4.32.x.
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && \
-	rm -f unlzma lzcat && \
-	$(LN_S) lzma unlzma && \
-	$(LN_S) lzma lzcat
+	rm -f unxz xzcat lzma unlzma lzcat && \
+	$(LN_S) xz unxz && \
+	$(LN_S) xz xzcat && \
+	$(LN_S) xz lzma && \
+	$(LN_S) xz unlzma && \
+	$(LN_S) xz lzcat
 
 uninstall-hook:
 	cd $(DESTDIR)$(bindir) && \
-	rm -f unlzma lzcat
+	rm -f unxz xzcat lzma unlzma lzcat
diff --git a/src/lzma/args.c b/src/xz/args.c
index a2efb277..a2efb277 100644
--- a/src/lzma/args.c
+++ b/src/xz/args.c
diff --git a/src/lzma/args.h b/src/xz/args.h
index 6d4e8282..6d4e8282 100644
--- a/src/lzma/args.h
+++ b/src/xz/args.h
diff --git a/src/lzma/hardware.c b/src/xz/hardware.c
index 63bf0937..63bf0937 100644
--- a/src/lzma/hardware.c
+++ b/src/xz/hardware.c
diff --git a/src/lzma/hardware.h b/src/xz/hardware.h
index f604df20..f604df20 100644
--- a/src/lzma/hardware.h
+++ b/src/xz/hardware.h
diff --git a/src/lzma/io.c b/src/xz/io.c
index 0ec63f03..0ec63f03 100644
--- a/src/lzma/io.c
+++ b/src/xz/io.c
diff --git a/src/lzma/io.h b/src/xz/io.h
index 4d8e61b2..4d8e61b2 100644
--- a/src/lzma/io.h
+++ b/src/xz/io.h
diff --git a/src/lzma/list.c b/src/xz/list.c
index 8728d47b..8728d47b 100644
--- a/src/lzma/list.c
+++ b/src/xz/list.c
diff --git a/src/lzma/main.c b/src/xz/main.c
index 4e24b98d..4e24b98d 100644
--- a/src/lzma/main.c
+++ b/src/xz/main.c
diff --git a/src/lzma/main.h b/src/xz/main.h
index 1e369425..1e369425 100644
--- a/src/lzma/main.h
+++ b/src/xz/main.h
diff --git a/src/lzma/message.c b/src/xz/message.c
index caba9fbc..caba9fbc 100644
--- a/src/lzma/message.c
+++ b/src/xz/message.c
diff --git a/src/lzma/message.h b/src/xz/message.h
index 7ef9b165..7ef9b165 100644
--- a/src/lzma/message.h
+++ b/src/xz/message.h
diff --git a/src/lzma/options.c b/src/xz/options.c
index 77ebddd6..77ebddd6 100644
--- a/src/lzma/options.c
+++ b/src/xz/options.c
diff --git a/src/lzma/options.h b/src/xz/options.h
index 4253ac3c..4253ac3c 100644
--- a/src/lzma/options.h
+++ b/src/xz/options.h
diff --git a/src/lzma/private.h b/src/xz/private.h
index b463a08e..b463a08e 100644
--- a/src/lzma/private.h
+++ b/src/xz/private.h
diff --git a/src/lzma/process.c b/src/xz/process.c
index d30878e4..d30878e4 100644
--- a/src/lzma/process.c
+++ b/src/xz/process.c
diff --git a/src/lzma/process.h b/src/xz/process.h
index de23eacb..de23eacb 100644
--- a/src/lzma/process.h
+++ b/src/xz/process.h
diff --git a/src/lzma/suffix.c b/src/xz/suffix.c
index 0d46855a..0d46855a 100644
--- a/src/lzma/suffix.c
+++ b/src/xz/suffix.c
diff --git a/src/lzma/suffix.h b/src/xz/suffix.h
index c92b92dc..c92b92dc 100644
--- a/src/lzma/suffix.h
+++ b/src/xz/suffix.h
diff --git a/src/lzma/util.c b/src/xz/util.c
index 13b67925..13b67925 100644
--- a/src/lzma/util.c
+++ b/src/xz/util.c
diff --git a/src/lzma/util.h b/src/xz/util.h
index dca62b26..dca62b26 100644
--- a/src/lzma/util.h
+++ b/src/xz/util.h
diff --git a/src/lzmadec/Makefile.am b/src/xzdec/Makefile.am
index 650eb1c4..8c8cae80 100644
--- a/src/lzmadec/Makefile.am
+++ b/src/xzdec/Makefile.am
@@ -12,18 +12,18 @@
 ##  Lesser General Public License for more details.
 ##
 
-bin_PROGRAMS = lzmadec
+bin_PROGRAMS = xzdec
 
-lzmadec_SOURCES = lzmadec.c
-lzmadec_CPPFLAGS = \
+xzdec_SOURCES = xzdec.c
+xzdec_CPPFLAGS = \
 	-I@top_srcdir@/src/common \
 	-I@top_srcdir@/src/liblzma/api \
 	-I@top_builddir@/lib
-lzmadec_LDFLAGS = -static
-lzmadec_LDADD = \
+xzdec_LDFLAGS = -static
+xzdec_LDADD = \
 	@top_builddir@/src/liblzma/liblzma.la \
 	@LTLIBINTL@
 
 if COND_GNULIB
-lzmadec_LDADD += @top_builddir@/lib/libgnu.a
+xzdec_LDADD += @top_builddir@/lib/libgnu.a
 endif
diff --git a/src/lzmadec/lzmadec.c b/src/xzdec/xzdec.c
index 0b2adb97..e100d049 100644
--- a/src/lzmadec/lzmadec.c
+++ b/src/xzdec/xzdec.c
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
-/// \file       lzmadec.c
+/// \file       xzdec.c
 /// \brief      Simple single-threaded tool to uncompress .lzma files
 //
 //  Copyright (C) 2007 Lasse Collin
@@ -151,7 +151,7 @@ set_default_memlimit(void)
 
 /// \brief      Converts a string to size_t
 ///
-/// This is rudely copied from src/lzma/util.c and modified a little. :-(
+/// This is rudely copied from src/xz/util.c and modified a little. :-(
 ///
 static size_t
 str_to_uint64(const char *value)