diff --git a/src/stub/Makefile b/src/stub/Makefile
index 65b46f13..a544bb35 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -64,8 +64,10 @@ STUBS += arm64-darwin.macho-entry.h
 STUBS += arm64-darwin.macho-fold.h
 STUBS += arm-linux.elf-entry.h
 STUBS += arm-linux.elf-fold.h
-STUBS += arm-linux.kernel.vmlinux-head.h
-STUBS += arm-linux.kernel.vmlinux.h
+STUBS += arm.v5a-linux.kernel.vmlinux-head.h
+STUBS += arm.v5a-linux.kernel.vmlinux.h
+STUBS += arm.v5a-linux.kernel.vmlinuz-head.h
+STUBS += arm.v5a-linux.kernel.vmlinuz.h
 STUBS += arm-linux.shlib-init.h
 STUBS += arm.v4a-wince.pe.h
 STUBS += arm.v4t-wince.pe.h
@@ -76,8 +78,6 @@ STUBS += armeb.v5a-linux.kernel.vmlinux.h
 STUBS += armel-eabi-linux.elf-entry.h
 STUBS += armel-eabi-linux.elf-fold.h
 STUBS += arm.v5a-linux.shlib-init.h
-STUBS += arm.v5a-linux.kernel.vmlinuz-head.h
-STUBS += arm.v5a-linux.kernel.vmlinuz.h
 STUBS += i086-dos16.com.h
 STUBS += i086-dos16.exe.h
 STUBS += i086-dos16.sys.h
@@ -509,23 +509,30 @@ tmp/arm-linux.elf-main.o : $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main
 
 
 # /***********************************************************************
-# // arm-linux.kernel.vmlinux      (arm.v5a)
-# // arm-linux.kernel.vmlinux-head (arm.v5a)
+# // arm.v5a-linux.kernel.vmlinux      (arm.v5a)
+# // arm.v5a-linux.kernel.vmlinux-head (arm.v5a)
+# // arm.v5a-linux.kernel.vmlinuz      (arm.v5a)
+# // arm.v5a-linux.kernel.vmlinuz-head (arm.v5a)
 # ************************************************************************/
 
-arm-linux.kernel.vmlinu%.h : tc_list = arm-linux.kernel default
-arm-linux.kernel.vmlinu%.h : tc_bfdname = elf32-littlearm
+arm.v5a-linux.kernel.vmlinu%.h : tc_list = arm.v5a-linux.kernel default
+arm.v5a-linux.kernel.vmlinu%.h : tc_bfdname = elf32-littlearm
 
-tc.arm-linux.kernel.gcc  = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
-tc.arm-linux.kernel.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
-tc.arm-linux.kernel.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror
+tc.arm.v5a-linux.kernel.gcc  = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
+tc.arm.v5a-linux.kernel.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
+tc.arm.v5a-linux.kernel.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror
 
-arm-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S
+arm.v5a-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
 	$(call tc,f-embed_objinfo,tmp/$T.bin)
 	$(call tc,bin2h-c) tmp/$T.bin $@
 
-arm-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S
+arm.v5a-linux.kernel.vmlinux-head.h : $(srcdir)/src/$$T.S
+	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
+	$(call tc,objcopy) --output-target binary --only-section .text tmp/$T.o tmp/$T.bin
+	$(call tc,bin2h) tmp/$T.bin $@
+
+arm.v5a-linux.kernel.vmlinuz-head.h : $(srcdir)/src/$$T.S
 	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
 	$(call tc,objcopy) --output-target binary --only-section .text tmp/$T.o tmp/$T.bin
 	$(call tc,bin2h) tmp/$T.bin $@
@@ -661,29 +668,6 @@ arm.v5a-linux.shlib%.h : $(srcdir)/src/$$T.S
 	$(call tc,bin2h-c) tmp/$T.bin $@
 
 
-# /***********************************************************************
-# // arm.v5a-linux.kernel.vmlinuz      (arm.v5a)
-# // arm.v5a-linux.kernel.vmlinuz-head (arm.v5a)
-# ************************************************************************/
-#
-arm.v5a-linux.kernel.vmlinu%.h : tc_list = arm.v5a-linux.kernel default
-arm.v5a-linux.kernel.vmlinu%.h : tc_bfdname = elf32-littlearm
-
-tc.arm.v5a-linux.kernel.gcc  = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@
-tc.arm.v5a-linux.kernel.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
-tc.arm.v5a-linux.kernel.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror
-
-arm.v5a-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S
-	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin
-	$(call tc,f-embed_objinfo,tmp/$T.bin)
-	$(call tc,bin2h-c) tmp/$T.bin $@
-
-arm.v5a-linux.kernel.vmlinuz-head.h : $(srcdir)/src/$$T.S
-	$(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.o
-	$(call tc,objcopy) --output-target binary --only-section .text tmp/$T.o tmp/$T.bin
-	$(call tc,bin2h) tmp/$T.bin $@
-
-
 # /***********************************************************************
 # // i086-dos16.com
 # ************************************************************************/
diff --git a/src/stub/arm-linux.kernel.vmlinux-head.h b/src/stub/arm.v5a-linux.kernel.vmlinux-head.h
similarity index 77%
rename from src/stub/arm-linux.kernel.vmlinux-head.h
rename to src/stub/arm.v5a-linux.kernel.vmlinux-head.h
index fbf8285a..b563828e 100644
--- a/src/stub/arm-linux.kernel.vmlinux-head.h
+++ b/src/stub/arm.v5a-linux.kernel.vmlinux-head.h
@@ -1,5 +1,5 @@
-/* arm-linux.kernel.vmlinux-head.h
-   created from arm-linux.kernel.vmlinux-head.bin, 8 (0x8) bytes
+/* arm.v5a-linux.kernel.vmlinux-head.h
+   created from arm.v5a-linux.kernel.vmlinux-head.bin, 8 (0x8) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,10 +31,10 @@
  */
 
 
-#define STUB_ARM_LINUX_KERNEL_VMLINUX_HEAD_SIZE    8
-#define STUB_ARM_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x17bb0637
-#define STUB_ARM_LINUX_KERNEL_VMLINUX_HEAD_CRC32   0xccc03eaa
+#define STUB_ARM_V5A_LINUX_KERNEL_VMLINUX_HEAD_SIZE    8
+#define STUB_ARM_V5A_LINUX_KERNEL_VMLINUX_HEAD_ADLER32 0x17bb0637
+#define STUB_ARM_V5A_LINUX_KERNEL_VMLINUX_HEAD_CRC32   0xccc03eaa
 
-unsigned char stub_arm_linux_kernel_vmlinux_head[8] = {
+unsigned char stub_arm_v5a_linux_kernel_vmlinux_head[8] = {
 /* 0x0000 */  14,192,160,225,254,255,255,235
 };
diff --git a/src/stub/arm-linux.kernel.vmlinux.h b/src/stub/arm.v5a-linux.kernel.vmlinux.h
similarity index 99%
rename from src/stub/arm-linux.kernel.vmlinux.h
rename to src/stub/arm.v5a-linux.kernel.vmlinux.h
index 9688e720..8499738b 100644
--- a/src/stub/arm-linux.kernel.vmlinux.h
+++ b/src/stub/arm.v5a-linux.kernel.vmlinux.h
@@ -1,5 +1,5 @@
-/* arm-linux.kernel.vmlinux.h
-   created from arm-linux.kernel.vmlinux.bin, 15163 (0x3b3b) bytes
+/* arm.v5a-linux.kernel.vmlinux.h
+   created from arm.v5a-linux.kernel.vmlinux.bin, 15163 (0x3b3b) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,11 +31,11 @@
  */
 
 
-#define STUB_ARM_LINUX_KERNEL_VMLINUX_SIZE    15163
-#define STUB_ARM_LINUX_KERNEL_VMLINUX_ADLER32 0x690d3249
-#define STUB_ARM_LINUX_KERNEL_VMLINUX_CRC32   0x579d826c
+#define STUB_ARM_V5A_LINUX_KERNEL_VMLINUX_SIZE    15163
+#define STUB_ARM_V5A_LINUX_KERNEL_VMLINUX_ADLER32 0x690d3249
+#define STUB_ARM_V5A_LINUX_KERNEL_VMLINUX_CRC32   0x579d826c
 
-unsigned char stub_arm_linux_kernel_vmlinux[15163] = {
+unsigned char stub_arm_v5a_linux_kernel_vmlinux[15163] = {
 /* 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 */ 244, 18,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,
diff --git a/src/stub/src/arm-linux.kernel.vmlinux-head.S b/src/stub/src/arm.v5a-linux.kernel.vmlinux-head.S
similarity index 100%
rename from src/stub/src/arm-linux.kernel.vmlinux-head.S
rename to src/stub/src/arm.v5a-linux.kernel.vmlinux-head.S
diff --git a/src/stub/src/arm-linux.kernel.vmlinux.S b/src/stub/src/arm.v5a-linux.kernel.vmlinux.S
similarity index 100%
rename from src/stub/src/arm-linux.kernel.vmlinux.S
rename to src/stub/src/arm.v5a-linux.kernel.vmlinux.S
diff --git a/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S b/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S
index 7ca08703..f1889e4c 100644
--- a/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S
+++ b/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S
@@ -1,4 +1,4 @@
 /* header for armel-linux.kernel.vmlinuz-head.S
  * is same as   arm-linux.kernel.vmlinux-head.S
  */
-#include "arm-linux.kernel.vmlinux-head.S"
+#include "arm.v5a-linux.kernel.vmlinux-head.S"
diff --git a/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S b/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S
index aa3514df..7eb8a36e 100644
--- a/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S
+++ b/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S
@@ -1,6 +1,6 @@
 /* source for armel-linux.kernel.vmlinuz.S
  * is same as   arm-linux.kernel.vmlinux.S
  * and has been factored out in p_vmlinz.cpp by using:
- *    #include "stub/arm-linux.kernel.vmlinux.h"
+ *    #include "stub/arm.v5a-linux.kernel.vmlinux.h"
  */
-#include "arm-linux.kernel.vmlinux.S"
+#include "arm.v5a-linux.kernel.vmlinux.S"
diff --git a/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S b/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S
index e585cdaa..66aca6c3 100644
--- a/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S
@@ -25,6 +25,6 @@
 ;  <jreiser@users.sourceforge.net>
 */
 
-#include "arm-linux.kernel.vmlinux-head.S"
+#include "arm.v5a-linux.kernel.vmlinux-head.S"
 
 // vi:ts=8:et:nowrap
diff --git a/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S b/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S
index 49fb0a69..15fb2e37 100644
--- a/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S
+++ b/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S
@@ -30,6 +30,6 @@
 ;  <jreiser@users.sourceforge.net>
 */
 
-#include "arm-linux.kernel.vmlinux.S"
+#include "arm.v5a-linux.kernel.vmlinux.S"
 
 // vi:ts=8:et:nowrap
diff --git a/src/stub/tmp/arm-linux.kernel.vmlinux.bin.dump b/src/stub/tmp/arm.v5a-linux.kernel.vmlinux.bin.dump
similarity index 100%
rename from src/stub/tmp/arm-linux.kernel.vmlinux.bin.dump
rename to src/stub/tmp/arm.v5a-linux.kernel.vmlinux.bin.dump