diff --git a/src/stub/Makefile b/src/stub/Makefile
index e4304d3a..ca7b17e6 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -58,8 +58,8 @@ STUBS += amd64-linux.kernel.vmlinux-head.h
 STUBS += amd64-linux.kernel.vmlinux.h
 STUBS += amd64-linux.shlib-init.h
 STUBS += amd64-win64.pep.h
-STUBS += arm-darwin.macho-entry.h
-STUBS += arm-darwin.macho-fold.h
+STUBS += arm.v5a-darwin.macho-entry.h
+STUBS += arm.v5a-darwin.macho-fold.h
 STUBS += arm64-darwin.macho-entry.h
 STUBS += arm64-darwin.macho-fold.h
 STUBS += arm-linux.elf-entry.h
@@ -407,30 +407,30 @@ amd64-win64.pep.h : $(srcdir)/src/$$T.S
 
 
 # /***********************************************************************
-# // arm-darwin.macho (arm.v5a)
+# // arm.v5a-darwin.macho (arm.v5a)
 # ************************************************************************/
 
 # info: we use the tc settings from arm-linux.elf, but override v4 with v5
-arm-darwin.macho%.h : tc_list = arm-linux.elf default
-arm-darwin.macho%.h : tc_bfdname = elf32-littlearm
-tc.arm-darwin.macho-entry.gcc  = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
-tc.arm-darwin.macho-fold.gcc   = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
+arm.v5a-darwin.macho%.h : tc_list = arm-linux.elf default
+arm.v5a-darwin.macho%.h : tc_bfdname = elf32-littlearm
+tc.arm.v5a-darwin.macho-entry.gcc  = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
+tc.arm.v5a-darwin.macho-fold.gcc   = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
 
-arm-darwin.macho-entry.h : $(srcdir)/src/$$T.S
+arm.v5a-darwin.macho-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
 	$(call tc,bin2h) tmp/$T.bin $@
 
-arm-darwin.macho-fold.h : tmp/$$T.o tmp/arm-darwin.macho-main.o
+arm.v5a-darwin.macho-fold.h : tmp/$$T.o tmp/arm.v5a-darwin.macho-main.o
 	$(call tc,ld) --no-warn-mismatch --strip-all --oformat binary -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	chmod a-x tmp/$T.bin
 	$(call tc,bin2h) tmp/$T.bin $@
 
-tmp/arm-darwin.macho-fold.o : $(srcdir)/src/$$T.S
+tmp/arm.v5a-darwin.macho-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
 	$(call tc,f-objstrip,$@)
 
-tmp/arm-darwin.macho-main.o : $(srcdir)/src/$$T.c
+tmp/arm.v5a-darwin.macho-main.o : $(srcdir)/src/$$T.c
 	$(call tc,gcc) -c -Os $< -o $@
 	$(call tc,f-objstrip,$@)
 
diff --git a/src/stub/arm-darwin.macho-entry.h b/src/stub/arm.v5a-darwin.macho-entry.h
similarity index 99%
rename from src/stub/arm-darwin.macho-entry.h
rename to src/stub/arm.v5a-darwin.macho-entry.h
index 6e6f725b..3b16b9f6 100644
--- a/src/stub/arm-darwin.macho-entry.h
+++ b/src/stub/arm.v5a-darwin.macho-entry.h
@@ -1,5 +1,5 @@
-/* arm-darwin.macho-entry.h
-   created from arm-darwin.macho-entry.bin, 14217 (0x3789) bytes
+/* arm.v5a-darwin.macho-entry.h
+   created from arm.v5a-darwin.macho-entry.bin, 14217 (0x3789) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,11 +31,11 @@
  */
 
 
-#define STUB_ARM_DARWIN_MACHO_ENTRY_SIZE    14217
-#define STUB_ARM_DARWIN_MACHO_ENTRY_ADLER32 0x46748cb2
-#define STUB_ARM_DARWIN_MACHO_ENTRY_CRC32   0x3eabef0a
+#define STUB_ARM_V5A_DARWIN_MACHO_ENTRY_SIZE    14217
+#define STUB_ARM_V5A_DARWIN_MACHO_ENTRY_ADLER32 0x46748cb2
+#define STUB_ARM_V5A_DARWIN_MACHO_ENTRY_CRC32   0x3eabef0a
 
-unsigned char stub_arm_darwin_macho_entry[14217] = {
+unsigned char stub_arm_v5a_darwin_macho_entry[14217] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   1,  0, 40,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0020 */  28, 19,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,
diff --git a/src/stub/arm-darwin.macho-fold.h b/src/stub/arm.v5a-darwin.macho-fold.h
similarity index 96%
rename from src/stub/arm-darwin.macho-fold.h
rename to src/stub/arm.v5a-darwin.macho-fold.h
index f8b747e1..f95ae00b 100644
--- a/src/stub/arm-darwin.macho-fold.h
+++ b/src/stub/arm.v5a-darwin.macho-fold.h
@@ -1,5 +1,5 @@
-/* arm-darwin.macho-fold.h
-   created from arm-darwin.macho-fold.bin, 1696 (0x6a0) bytes
+/* arm.v5a-darwin.macho-fold.h
+   created from arm.v5a-darwin.macho-fold.bin, 1696 (0x6a0) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,11 +31,11 @@
  */
 
 
-#define STUB_ARM_DARWIN_MACHO_FOLD_SIZE    1696
-#define STUB_ARM_DARWIN_MACHO_FOLD_ADLER32 0x93dddb92
-#define STUB_ARM_DARWIN_MACHO_FOLD_CRC32   0x2a2f439c
+#define STUB_ARM_V5A_DARWIN_MACHO_FOLD_SIZE    1696
+#define STUB_ARM_V5A_DARWIN_MACHO_FOLD_ADLER32 0x93dddb92
+#define STUB_ARM_V5A_DARWIN_MACHO_FOLD_CRC32   0x2a2f439c
 
-unsigned char stub_arm_darwin_macho_fold[1696] = {
+unsigned char stub_arm_v5a_darwin_macho_fold[1696] = {
 /* 0x0000 */   0, 16,155,229, 68,112,141,226,  1,  0, 75,224, 24, 48,144,229,
 /* 0x0010 */   2, 10, 83,227,  2, 58,160,147,  3,208, 77,224, 13, 32,160,225,
 /* 0x0020 */  20, 96,143,226,224,  0, 45,233, 54,  1,  0,235, 60,  0,144,229,
diff --git a/src/stub/src/arm-darwin.macho-entry.S b/src/stub/src/arm.v5a-darwin.macho-entry.S
similarity index 100%
rename from src/stub/src/arm-darwin.macho-entry.S
rename to src/stub/src/arm.v5a-darwin.macho-entry.S
diff --git a/src/stub/src/arm-darwin.macho-fold.S b/src/stub/src/arm.v5a-darwin.macho-fold.S
similarity index 100%
rename from src/stub/src/arm-darwin.macho-fold.S
rename to src/stub/src/arm.v5a-darwin.macho-fold.S
diff --git a/src/stub/src/arm-darwin.macho-main.c b/src/stub/src/arm.v5a-darwin.macho-main.c
similarity index 100%
rename from src/stub/src/arm-darwin.macho-main.c
rename to src/stub/src/arm.v5a-darwin.macho-main.c
diff --git a/src/stub/tmp/arm-darwin.macho-entry.bin.dump b/src/stub/tmp/arm.v5a-darwin.macho-entry.bin.dump
similarity index 100%
rename from src/stub/tmp/arm-darwin.macho-entry.bin.dump
rename to src/stub/tmp/arm.v5a-darwin.macho-entry.bin.dump