diff --git a/lzma/C/Makefile.am b/lzma/C/Makefile.am
index ab16058..ee648da 100644
--- a/lzma/C/Makefile.am
+++ b/lzma/C/Makefile.am
@@ -59,5 +59,9 @@ $(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
+	@printf "%s\n" "# $(ASM_7z).lo - a libtool object file"              >> $(ASM_7z).lo
+	@printf "%s\n" "# Generated by libtool -- hack to allow asm linking" >> $(ASM_7z).lo
+	@printf "%s\n" "# Peter Hyman"                  >> $(ASM_7z).lo
+	@printf "%s\n" "pic_object='.libs/$(ASM_7z).o'" >> $(ASM_7z).lo
+	@printf "%s\n" "non_pic_object='$(ASM_7z).o''"  >> $(ASM_7z).lo
 endif
diff --git a/lzma/Makefile.am b/lzma/Makefile.am
index d4f97f0..7489e1d 100644
--- a/lzma/Makefile.am
+++ b/lzma/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = C ASM/x86
+SUBDIRS = C
 MAINTAINERCLEANFILES = Makefile.in
 
 lzmadocdir = @docdir@/lzma