diff --git a/src/stub/Makefile b/src/stub/Makefile
index ca7b17e6..b26b307d 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -69,8 +69,8 @@ STUBS += arm-linux.kernel.vmlinux.h
 STUBS += arm-linux.shlib-init.h
 STUBS += arm.v4a-wince.pe.h
 STUBS += arm.v4t-wince.pe.h
-STUBS += armeb-linux.elf-entry.h
-STUBS += armeb-linux.elf-fold.h
+STUBS += armeb.v4a-linux.elf-entry.h
+STUBS += armeb.v4a-linux.elf-fold.h
 STUBS += armeb.v5a-linux.kernel.vmlinux-head.h
 STUBS += armeb.v5a-linux.kernel.vmlinux.h
 STUBS += armel-eabi-linux.elf-entry.h
@@ -568,30 +568,30 @@ arm.v4t-wince.pe.h : $(srcdir)/src/$$T.S
 
 
 # /***********************************************************************
-# // armeb-linux.elf (arm.v4a)
+# // armeb.v4a-linux.elf (arm.v4a)
 # ************************************************************************/
 
-armeb-linux.elf%.h : tc_list = armeb-linux.elf default
-armeb-linux.elf%.h : tc_bfdname = elf32-bigarm
+armeb.v4a-linux.elf%.h : tc_list = armeb.v4a-linux.elf default
+armeb.v4a-linux.elf%.h : tc_bfdname = elf32-bigarm
 
-tc.armeb-linux.elf.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian
+tc.armeb.v4a-linux.elf.gcc = $(tc.arm-linux.elf.gcc) -mbig-endian
 
-armeb-linux.elf-entry.h : $(srcdir)/src/$$T.S
+armeb.v4a-linux.elf-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 $@
 
-armeb-linux.elf-fold.h : tmp/$$T.o tmp/armeb-linux.elf-main.o $(srcdir)/src/$$T.lds
+armeb.v4a-linux.elf-fold.h : tmp/$$T.o tmp/armeb.v4a-linux.elf-main.o $(srcdir)/src/$$T.lds
 	$(call tc,ld) --strip-all -T $(srcdir)/src/$T.lds -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
 	$(call tc,f-objstrip,tmp/$T.bin)
 	$(call tc,sstrip) tmp/$T.bin
 	$(call tc,bin2h) tmp/$T.bin $@
 
-tmp/armeb-linux.elf-fold.o : $(srcdir)/src/$$T.S
+tmp/armeb.v4a-linux.elf-fold.o : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c $< -o $@
 	$(call tc,f-objstrip,$@)
 
-tmp/armeb-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main.c
+tmp/armeb.v4a-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main.c
 	$(call tc,gcc) -c -Os $< -o $@
 	$(call tc,f-objstrip,$@)
 
diff --git a/src/stub/armeb-linux.elf-entry.h b/src/stub/armeb.v4a-linux.elf-entry.h
similarity index 99%
rename from src/stub/armeb-linux.elf-entry.h
rename to src/stub/armeb.v4a-linux.elf-entry.h
index e7ff3c16..916e2f24 100644
--- a/src/stub/armeb-linux.elf-entry.h
+++ b/src/stub/armeb.v4a-linux.elf-entry.h
@@ -1,5 +1,5 @@
-/* armeb-linux.elf-entry.h
-   created from armeb-linux.elf-entry.bin, 14936 (0x3a58) bytes
+/* armeb.v4a-linux.elf-entry.h
+   created from armeb.v4a-linux.elf-entry.bin, 14936 (0x3a58) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,11 +31,11 @@
  */
 
 
-#define STUB_ARMEB_LINUX_ELF_ENTRY_SIZE    14936
-#define STUB_ARMEB_LINUX_ELF_ENTRY_ADLER32 0x155120f3
-#define STUB_ARMEB_LINUX_ELF_ENTRY_CRC32   0x9e120aec
+#define STUB_ARMEB_V4A_LINUX_ELF_ENTRY_SIZE    14936
+#define STUB_ARMEB_V4A_LINUX_ELF_ENTRY_ADLER32 0x155120f3
+#define STUB_ARMEB_V4A_LINUX_ELF_ENTRY_CRC32   0x9e120aec
 
-unsigned char stub_armeb_linux_elf_entry[14936] = {
+unsigned char stub_armeb_v4a_linux_elf_entry[14936] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  2,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   0,  1,  0, 40,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0020 */   0,  0, 19,120,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,
diff --git a/src/stub/armeb-linux.elf-fold.h b/src/stub/armeb.v4a-linux.elf-fold.h
similarity index 97%
rename from src/stub/armeb-linux.elf-fold.h
rename to src/stub/armeb.v4a-linux.elf-fold.h
index 2763a968..d7b0db59 100644
--- a/src/stub/armeb-linux.elf-fold.h
+++ b/src/stub/armeb.v4a-linux.elf-fold.h
@@ -1,5 +1,5 @@
-/* armeb-linux.elf-fold.h
-   created from armeb-linux.elf-fold.bin, 2580 (0xa14) bytes
+/* armeb.v4a-linux.elf-fold.h
+   created from armeb.v4a-linux.elf-fold.bin, 2580 (0xa14) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,11 +31,11 @@
  */
 
 
-#define STUB_ARMEB_LINUX_ELF_FOLD_SIZE    2580
-#define STUB_ARMEB_LINUX_ELF_FOLD_ADLER32 0x7ce42e4a
-#define STUB_ARMEB_LINUX_ELF_FOLD_CRC32   0x256662b1
+#define STUB_ARMEB_V4A_LINUX_ELF_FOLD_SIZE    2580
+#define STUB_ARMEB_V4A_LINUX_ELF_FOLD_ADLER32 0x7ce42e4a
+#define STUB_ARMEB_V4A_LINUX_ELF_FOLD_CRC32   0x256662b1
 
-unsigned char stub_armeb_linux_elf_fold[2580] = {
+unsigned char stub_armeb_v4a_linux_elf_fold[2580] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  2,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   0,  2,  0, 40,  0,  0,  0,  1,  0,  0,128,128,  0,  0,  0, 52,
 /* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  2,  0, 52,  0, 32,  0,  2,  0,  0,
diff --git a/src/stub/src/armeb-linux.elf-entry.S b/src/stub/src/armeb.v4a-linux.elf-entry.S
similarity index 100%
rename from src/stub/src/armeb-linux.elf-entry.S
rename to src/stub/src/armeb.v4a-linux.elf-entry.S
diff --git a/src/stub/src/armeb-linux.elf-fold.S b/src/stub/src/armeb.v4a-linux.elf-fold.S
similarity index 100%
rename from src/stub/src/armeb-linux.elf-fold.S
rename to src/stub/src/armeb.v4a-linux.elf-fold.S
diff --git a/src/stub/src/armeb-linux.elf-fold.lds b/src/stub/src/armeb.v4a-linux.elf-fold.lds
similarity index 100%
rename from src/stub/src/armeb-linux.elf-fold.lds
rename to src/stub/src/armeb.v4a-linux.elf-fold.lds
diff --git a/src/stub/src/armeb-linux.elf-main.c b/src/stub/src/armeb.v4a-linux.elf-main.c
similarity index 100%
rename from src/stub/src/armeb-linux.elf-main.c
rename to src/stub/src/armeb.v4a-linux.elf-main.c
diff --git a/src/stub/tmp/armeb-linux.elf-entry.bin.dump b/src/stub/tmp/armeb.v4a-linux.elf-entry.bin.dump
similarity index 100%
rename from src/stub/tmp/armeb-linux.elf-entry.bin.dump
rename to src/stub/tmp/armeb.v4a-linux.elf-entry.bin.dump