diff --git a/src/stub/src/arch/i386/Makefile.extra b/src/stub/src/arch/i386/Makefile.extra
index 70fe9b54..40bcb118 100644
--- a/src/stub/src/arch/i386/Makefile.extra
+++ b/src/stub/src/arch/i386/Makefile.extra
@@ -21,17 +21,17 @@ STUBS =
 
 ifneq ($(wildcard $(UPX_LZMADIR)/C/7zip/.),)
 
-STUBS += lzma_d_cf.ash lzma_d_cs.ash
+STUBS += lzma_d_cf.S lzma_d_cs.S
 
-lzma_d_c%.ash : tc_list = i386-lzma i386-linux.elf arch-i386 default
-lzma_d_c%.ash : tc_bfdname = elf32-i386
+lzma_d_c%.S : tc_list = i386-lzma i386-linux.elf arch-i386 default
+lzma_d_c%.S : tc_bfdname = elf32-i386
 
 tc.i386-lzma.gcc      = $(tc.i386-linux.elf.gcc)
 tc.i386-lzma.gcc     += -ffunction-sections
 tc.i386-lzma.gcc     += -I$(UPX_LZMADIR)
 tc.i386-lzma.gcc     += -I$(top_srcdir)/src
 
-lzma_d_c%.ash : lzma_d_c.c
+lzma_d_c%.S : lzma_d_c.c
 	$(call tc,gcc) $(PP_FLAGS) -c $< -o tmp/$T.o
 	$(call tc,objstrip) tmp/$T.o
 	$(call tc,objcopy) -O binary --only-section .text.LzmaDecode tmp/$T.o tmp/$T.bin
diff --git a/src/stub/src/arch/i386/cl1_d32.ash b/src/stub/src/arch/i386/OLD-nasm/cl1_d32.ash
similarity index 100%
rename from src/stub/src/arch/i386/cl1_d32.ash
rename to src/stub/src/arch/i386/OLD-nasm/cl1_d32.ash
diff --git a/src/stub/src/arch/i386/lzma_d.ash b/src/stub/src/arch/i386/OLD-nasm/lzma_d.ash
similarity index 100%
rename from src/stub/src/arch/i386/lzma_d.ash
rename to src/stub/src/arch/i386/OLD-nasm/lzma_d.ash
diff --git a/src/stub/src/arch/i386/lzma_d_cf.ash b/src/stub/src/arch/i386/OLD-nasm/lzma_d_cf.ash
similarity index 100%
rename from src/stub/src/arch/i386/lzma_d_cf.ash
rename to src/stub/src/arch/i386/OLD-nasm/lzma_d_cf.ash
diff --git a/src/stub/src/arch/i386/lzma_d_cs.ash b/src/stub/src/arch/i386/OLD-nasm/lzma_d_cs.ash
similarity index 100%
rename from src/stub/src/arch/i386/lzma_d_cs.ash
rename to src/stub/src/arch/i386/OLD-nasm/lzma_d_cs.ash
diff --git a/src/stub/src/arch/i386/macros.ash b/src/stub/src/arch/i386/OLD-nasm/macros.ash
similarity index 100%
rename from src/stub/src/arch/i386/macros.ash
rename to src/stub/src/arch/i386/OLD-nasm/macros.ash
diff --git a/src/stub/src/arch/i386/nrv2b_d32.ash b/src/stub/src/arch/i386/OLD-nasm/nrv2b_d32.ash
similarity index 100%
rename from src/stub/src/arch/i386/nrv2b_d32.ash
rename to src/stub/src/arch/i386/OLD-nasm/nrv2b_d32.ash
diff --git a/src/stub/src/arch/i386/nrv2d_d32.ash b/src/stub/src/arch/i386/OLD-nasm/nrv2d_d32.ash
similarity index 100%
rename from src/stub/src/arch/i386/nrv2d_d32.ash
rename to src/stub/src/arch/i386/OLD-nasm/nrv2d_d32.ash
diff --git a/src/stub/src/arch/i386/nrv2e_d32.ash b/src/stub/src/arch/i386/OLD-nasm/nrv2e_d32.ash
similarity index 100%
rename from src/stub/src/arch/i386/nrv2e_d32.ash
rename to src/stub/src/arch/i386/OLD-nasm/nrv2e_d32.ash