diff --git a/Makefile.am b/Makefile.am
index f9907bf..6fee462 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,8 @@ ltmain.sh \
 missing \
 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.xz \
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.lrz \
 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \
 m4/libtool.m4 \
 m4/lt~obsolete.m4 \
diff --git a/lzma/ASM/x86/Makefile.am b/lzma/ASM/x86/Makefile.am
index fc745f4..8d95149 100644
--- a/lzma/ASM/x86/Makefile.am
+++ b/lzma/ASM/x86/Makefile.am
@@ -1,8 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-lzmaasm_SOURCES = \
+noinst_LTLIBRARIES = liblzmaasm.la
+
+liblzmaasm_la_SOURCES = \
 	7zAsm.asm \
 	7zCrcOpt_asm.asm
-
-EXTRA_DIST = $(lzmaasm_SOURCES)
-lzmaasmdir = @abs_top_srcdir@/lzma/ASM/x86/
diff --git a/lzma/C/Makefile.am b/lzma/C/Makefile.am
index 3d87335..ab16058 100644
--- a/lzma/C/Makefile.am
+++ b/lzma/C/Makefile.am
@@ -7,13 +7,11 @@ AM_CFLAGS = \
   -I@top_srcdir@
 
 ASM_S =
-ASM_H =
 ASM_7z =
 C_S =
 if USE_ASM
   ASM_7z += 7zCrcOpt_asm
   ASM_S += @abs_top_srcdir@/lzma/ASM/x86/$(ASM_7z).asm
-  ASM_H += @abs_top_srcdir@/lzma/ASM/x86/7zAsm.asm
   C_S += 7zCrcT8.c
 else
   C_S += 7zCrc.c 
@@ -61,5 +59,5 @@ $(ASM_7z).lo: $(ASM_S)
 	$(ASM_PROG) $(ASM_OPT) -o $(ASM_7z).o $(ASM_S)
 	mkdir -p .libs
 	cp $(ASM_7z).o .libs/
-	@echo -e "$(7ZIPASMLOFILE)" > $(ASM_7z).lo 
+	@echo -e "$(7ZIPASMLOFILE)" > $(ASM_7z).lo
 endif