diff --git a/misc/testsuite/upx_testsuite_1-expected_sha256sums.sh b/misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
index 6681eb62..09f38c2b 100644
--- a/misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
+++ b/misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
@@ -61,7 +61,7 @@ e17a126cebc32977991a292b7434d1435a7c95862ccece0e4acbf6e810bd3443 *i386-dos32.djg
 9bc7ba34e675311527776726a98450722ac9faee73ef5df96a8e8dbd2943b734 *i386-win32.pe/upx-3.91.exe
 0a33acc8fa5549c59a87897b318ab83d1eb2ffa7d6c156e92d71c4e9ab4c6483 *i386-win32.pe/upx-3.95.exe
 22a6fe5e84dc759675c14314f1d72b84b64e22d106b4158969f5bc4f572288a1 *m68k-atari.tos/upx-3.91.ttp
-bc6385bab67b8fe3f1d2603ef1564a62f5f6a5a32a1b74d79c17743d138722d9 *mips-linux.elf/upx-3.95
+183ba10c77905850b86a4bbd733b7394d1985b982b01d07e215cd7e01b859a9f *mips-linux.elf/upx-3.95
 05287db121d07bf1405120afd42e1ba32853d9c601f4533d975f1bf931ace6c5 *mipsel-linux.elf/upx-3.91
 43f2b05c68d5c64ceff59602dc1325f1c21b7115e23f22cdd93792a0470975f4 *mipsel-linux.elf/upx-3.95
 05271eccd8359423b553dcf587404fef02a71f5c08d96ea39051dd70f470d581 *powerpc-linux.elf/upx-3.91
@@ -84,7 +84,7 @@ b4956f9278bfffcb32301f2663201cffa13214cb4eef52b125a38a5d8bec0ab1 *i386-linux.elf
 18c0e4fb6bf6b26b5c943c54571007b4aba4d0a4ba7391c149eeada54a0a404d *i386-win32.pe/upx-3.91.exe
 8501c4a677eb66b482987122febc0360fc02f6720fd7c19d311cf60314d5705e *i386-win32.pe/upx-3.95.exe
 b8d481769be7aa7768bb1bd8775e766512c5720813e5d8bab6decb200a916f11 *m68k-atari.tos/upx-3.91.ttp
-55afa544c2209a9a804e419326e129ec5c5488a276f5e53588b63d1f205325c7 *mips-linux.elf/upx-3.95
+a272943c0df8675e19229118fd5c9389d1322e3cf86fbaa5ee756afc77f4f5c1 *mips-linux.elf/upx-3.95
 596d3aebc0dc1126668f72d0acb4976c5280f54fb797cea1dcb23e12449bfc4b *mipsel-linux.elf/upx-3.91
 30193e08acaa16c454c4b6e2602b573a5e13655fee00e431628f46211dae0bc9 *mipsel-linux.elf/upx-3.95
 761ef54c7652dcd63d6efbe26fe1796963623d915f0cb504b753071172acd5b2 *powerpc-linux.elf/upx-3.91
@@ -107,7 +107,7 @@ d454dd376db342e7650a93bd4859546711c94f5da55336e5b969dbea996465d9 *i386-dos32.djg
 674216006959b78ef9bfeed682a6a858f657a860123c620dc77daf5d3c46c40d *i386-win32.pe/upx-3.91.exe
 a47825b63e33e2ff5f07ec2b8e51991172a1e26e17fa1b2a19dc7857ab76db35 *i386-win32.pe/upx-3.95.exe
 2fc38c89629269a6c5ec22113f6a84a8b91e04c861359125d1c8e44d17ac190a *m68k-atari.tos/upx-3.91.ttp
-495101dff02d9ee2394b904177d6a19c6921dc9e61f308794b5eca8cf05dc318 *mips-linux.elf/upx-3.95
+612df08077c17732bca0b93b12ea364b1b01c81b477bb2b56c82a19b97117f77 *mips-linux.elf/upx-3.95
 3e25189617d56c13162f2b0fd428e2226600f655d344e8e71d60b3c5127cd7f9 *mipsel-linux.elf/upx-3.91
 381c2959188999e91ac07ce3011f88c9854f502420536680a91533e5877afc90 *mipsel-linux.elf/upx-3.95
 fcb2a603f7f9ec7cf8f393c372461c3d2a531e05c343ace7e8c17d8fcffe3d47 *powerpc-linux.elf/upx-3.91
@@ -130,7 +130,7 @@ b6a1ff1e4853e5301b964599ac5f8c2f16a480fa12526ef915ace10b21cb769e *i386-linux.elf
 a33d057a391218e62f427cdd31c5850d5637346106f23523d21addc60451e159 *i386-win32.pe/upx-3.91.exe
 24ecb3b5fd2f8d81f7deeadbec1988dc62503345d36b60bd17b9a4a09f8cbfb6 *i386-win32.pe/upx-3.95.exe
 d81bbba6a8ede3aa9bebcd28280914c1084dc0a9ff1d000389e3f52ff05a1ac7 *m68k-atari.tos/upx-3.91.ttp
-f477d4f6d8ae0594b199e12c66698e6603c860b51f26a297567db32d08efc60f *mips-linux.elf/upx-3.95
+114c8c8b31bc996e6515ebe2659763c871299a08cc8b14eac251db0fab5f0683 *mips-linux.elf/upx-3.95
 966ae6b8a17fc6f235fe85ca64cfa7fe2a37299658e8bd4243fbec54bfc8c1ae *mipsel-linux.elf/upx-3.91
 eb0866b14c47732f178b05e4291005aaa205eb5af83dedc261752c869b8ce90d *mipsel-linux.elf/upx-3.95
 d040fdf9166dedd0a888b9a6f422e2f9c5b963a67a531974b36dff8935b8b5cb *powerpc-linux.elf/upx-3.91
@@ -153,7 +153,7 @@ e731e899c888517205f8dae1d5a8073a8619b14ffe6e5d2c9c7d545e272a74ad *armeb-linux.el
 b233f8508a150a20dffaeb6da057ccfd1cf78fbb89d9bdf3fbdd1c21716665e3 *i386-win32.pe/upx-3.91.exe
 57a4ff483773e64ab95963445049bff4044e055f31c13bd74c039fba1f113401 *i386-win32.pe/upx-3.95.exe
 1c8973e104c93be98db7d5411b478d0badb7b6d5373f7d28e94f435fb31faa7e *m68k-atari.tos/upx-3.91.ttp
-3fb380f1ce84562d7765c88eb713255fa48b616e9ba4408f0e57eb6e6fb040b8 *mips-linux.elf/upx-3.95
+c00b1ec147e3f267ec26fbb78b97a9c8e987af7853376d2bd46e11350e5807ef *mips-linux.elf/upx-3.95
 564bc557f91f1c430b45477acfe5bd6319c5da7442546b2cc8a33d3bc1dbe6fd *mipsel-linux.elf/upx-3.91
 4201cc74d03cfc223df4c8d742f968ee548e8cd48d1470459ec2d302be23f4b0 *mipsel-linux.elf/upx-3.95
 98504e7aa21ecfc09bb8e053f458af134b080181e7cc5b02303d7eb75e23992c *powerpc-linux.elf/upx-3.91
@@ -176,7 +176,7 @@ de1a30aa37f475ad5045e5895f034bc8f0d59b9de0a51989f1deb3a048d51039 *i386-linux.elf
 20c9fcde690091218f83c1f9fcb9a8d211f384569724801c89f3ce5d23356004 *i386-win32.pe/upx-3.91.exe
 c99b42e740ca0fb80a06d2e76c0b5d9169fb76900521c5ccd8e2e5a46f5020d3 *i386-win32.pe/upx-3.95.exe
 0bc481806564627f23125e3ab6fa59e8b90e35f0f117c3d185a728086ad02351 *m68k-atari.tos/upx-3.91.ttp
-5ebeef4be2fb1906421bea23cfbc4e5aab84c147eed0d081dd35f3865684f647 *mips-linux.elf/upx-3.95
+82b2c2750a8d6ff910129afa65b7331bdaa2a8b85dec95f751551b39cd7088b8 *mips-linux.elf/upx-3.95
 e98160a088c55547485da2d971665d03c8442277e63b645d23011b1277f4ffc9 *mipsel-linux.elf/upx-3.91
 b49cf789b8664cb1d864403e95ce9eb1a4b15af2189ea34da53d56c1e690882d *mipsel-linux.elf/upx-3.95
 041ce02b4d2c65876dea248c385e6bb4d81cff5691cb0d3c195c553f0ff6fae7 *powerpc-linux.elf/upx-3.91
@@ -199,7 +199,7 @@ b8d5c40003dec6e3efe173bcba15b4196316d362b8e9bf802a528c0c9f77c943 *armeb-linux.el
 63afac5307a2385757b3d29753c64e0026241ea2ca1324f53e8ccb4263cc9f62 *i386-win32.pe/upx-3.91.exe
 eb01b6f27798690115cabb88314551579da509455232bbaa3276eddc25106d0d *i386-win32.pe/upx-3.95.exe
 3a5fa857ff517e41386062a0fb2be4f8b6fa5cb79d5624b5a00947c1f2758afb *m68k-atari.tos/upx-3.91.ttp
-92999d0969a2c87daa4b26ab31c86ae9a14ab5d9c79fb7debef1ae9bc9628dbb *mips-linux.elf/upx-3.95
+7758b2b0b73c51805f83fe12b2c1592576566213231e6aae71f76515c08c1d20 *mips-linux.elf/upx-3.95
 a16400937ea1e807fa67599d01422d36c896e3b4ab44693407bf6823cb41c9f9 *mipsel-linux.elf/upx-3.91
 3942a43c8972ecfef15d28eae590d279e7745369a3214fbd498676bf99defc78 *mipsel-linux.elf/upx-3.95
 35e50f5fbf25074f78681a595fbc503095e24a0d7054157fc7560d496480ccc0 *powerpc-linux.elf/upx-3.91
diff --git a/src/stub/Makefile b/src/stub/Makefile
index 65eabb39..d09518cc 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -1594,8 +1594,8 @@ mips.r3000-linux.elf-entry.h : \
 	    $(srcdir)/src/$$T.S
 	@echo; echo TARGET: $@; echo
 	mipsel-linux-gcc-4.1.1 -E -meb -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-	    -D__mipsel__  -D__MIPS__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \
-	    | mips-elf-as-20060406 -EL -O -mno-pdr  -o tmp/mips.r3000-linux.elf-entry.bin
+	    -D__mips__  -D__MIPS__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \
+	    | mipsel-elf-as-20060406 -EB -O -mno-pdr  -o tmp/mips.r3000-linux.elf-entry.bin
 	$(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $(srcdir)/src/$T.S
 	$(call tc,f-embed_objinfo_without_xstrip,tmp/$T.bin)
 	$(call tc,bin2h) tmp/$T.bin $@
@@ -1613,7 +1613,7 @@ mips.r3000-linux.elf-fold.h : $(srcdir)/src/$$T.lds \
 	    src/mips.r3000-expand.S
 	(cd tmp; ln -sf ../src/arch arch)
 	$(call tc,gcc) -E \
-	        -D__mips__ -D__MIPSEB__ -D_TARGET_LINUX_ \
+	        -D__mips__ -D__MIPS__ -D_TARGET_LINUX_ \
 	        tmp/mips.r3000-linux.elf-fold-2.S \
 	    | sed -e $$(cat src/dollar-dollar.sed) > tmp/mips.r3000-linux.elf-fold-3.S
 	# info: as-2.16.1 as used by gcc-4.1.1 does _not_ work`
@@ -1633,7 +1633,7 @@ tmp/mips.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
 	    mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
 	        -fno-exceptions -fno-asynchronous-unwind-tables \
 	        -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror \
-		-D__mips__ -D__MIPS__ -D__MIPSEL__ -D_TARGET_LINUX_\
+		-D__mips__ -D__MIPS__ -D__MIPSEB__ -D_TARGET_LINUX_\
 		-I../src -S -O mips.r3000-linux.elf-upxfd_linux.c -o - \
 	    | cat ../src/mips.r3000-linux.elf-help_umf.S - \
 	    | sed  > mips.r3000-linux.elf-upxfd_linux.s \
@@ -1679,7 +1679,7 @@ mips.r3000-linux.shlib%.h : tc_bfdname = elf32-bigmips
 mips.r3000-linux.shlib%.h : $(srcdir)/src/$$T.S
 ifeq (1,1)
 	# info: we really need as-2.17 here
-	$(call tc,pp-as) -D_TARGET_LINUX_ -D__MIPSEB__ $< -o - | $(RTRIM) > tmp/$T.i
+	$(call tc,pp-as) -D_TARGET_LINUX_ -D__mips__ -D__MIPSEB__ $< -o - | $(RTRIM) > tmp/$T.i
 	$(call tc,as) tmp/$T.i -o tmp/$T.bin
 	$(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $<
 else
@@ -1701,7 +1701,7 @@ mipsel.r3000-linux.elf%.h : tc_bfdname = elf32-littlemips
 tc.mipsel.r3000-linux.elf.as   = mipsel-elf-as-20060406 -EL -O -mno-pdr \
 	-D__mips__  -D__MIPSEL__ -D_TARGET_LINUX_
 tc.mipsel.r3000-linux.elf.pp-as= mipsel-elf-as-20060406 -EL -mabi=eabi -Wall -mno-pdr
-tc.mipsel.r3000-linux.elf.gcc  = mipsel-linux-gcc-4.1.1 -mel -D__MIPS__ -D__MIPSEL__ -D_TARGET_LINUX_ \
+tc.mipsel.r3000-linux.elf.gcc  = mipsel-linux-gcc-4.1.1 -mel -D__mips__ -D__MIPSEL__ -D_TARGET_LINUX_ \
 	-march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
 tc.mipsel.r3000-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
 tc.mipsel.r3000-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror
@@ -1711,7 +1711,7 @@ mipsel.r3000-linux.elf-entry.h : \
 	    $(srcdir)/src/$$T.S
 	@echo; echo TARGET: $@; echo
 	mipsel-linux-gcc-4.1.1 -E -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
-	    -D__mipsel__  -D__MIPSEL__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \
+	    -D__mips__  -D__MIPSEL__ -D_TARGET_LINUX_ $(srcdir)/src/$T.S \
 	    | mipsel-elf-as-20060406 -EL -O -mno-pdr  -o tmp/mipsel.r3000-linux.elf-entry.bin
 	$(call tc,gpp_mkdep) --mode=c --MMD=$@ --MF=tmp/$T.d $(srcdir)/src/$T.S
 	$(call tc,f-embed_objinfo_without_xstrip,tmp/$T.bin)
@@ -1750,7 +1750,7 @@ tmp/mipsel.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
 	    mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD \
 	        -fno-exceptions -fno-asynchronous-unwind-tables \
 	        -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror \
-		-D__mips__ -D__MIPS__ -D__MIPSEL__ -D_TARGET_LINUX_\
+		-D__mips__ -D__MIPSEL__ -D_TARGET_LINUX_\
 		-I../src -S -O mipsel.r3000-linux.elf-upxfd_linux.c -o - \
 	    | cat ../src/mipsel.r3000-linux.elf-help_umf.S - \
 	    | sed  > mipsel.r3000-linux.elf-upxfd_linux.s \
@@ -1765,7 +1765,7 @@ tmp/mipsel.r3000-linux.elf-upxfd_linux.s : $(srcdir)/src/upxfd_linux.c
 
 tmp/mipsel.r3000-linux.elf-main2.s: $(srcdir)/src/$$T.c $(srcdir)/src/i386-linux.elf-main2.c
 	@echo; echo TARGET: $@; echo
-	$(call tc,gcc) -S -D__mipsel__ -D_TARGET_LINUX_ -O $< -o - \
+	$(call tc,gcc) -S -D__mips__ -D__MIPSEL__ -D_TARGET_LINUX_ -O $< -o - \
 	    | sed -e '/section .gcc_compiled/d' \
 	          -e '/section .mdebug.eabi/d' \
 	          -e '/^\t\.file\t/d' \
diff --git a/src/stub/mips.r3000-linux.elf-entry.h b/src/stub/mips.r3000-linux.elf-entry.h
index 2e726bdb..6e2b2b44 100644
--- a/src/stub/mips.r3000-linux.elf-entry.h
+++ b/src/stub/mips.r3000-linux.elf-entry.h
@@ -1,5 +1,5 @@
 /* mips.r3000-linux.elf-entry.h
-   created from mips.r3000-linux.elf-entry.bin, 2115 (0x843) bytes
+   created from mips.r3000-linux.elf-entry.bin, 2056 (0x808) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -32,11 +32,11 @@
 
 /* clang-format off */
 
-#define STUB_MIPS_R3000_LINUX_ELF_ENTRY_SIZE    2115
-#define STUB_MIPS_R3000_LINUX_ELF_ENTRY_ADLER32 0x6cc99f94
-#define STUB_MIPS_R3000_LINUX_ELF_ENTRY_CRC32   0xd70b6424
+#define STUB_MIPS_R3000_LINUX_ELF_ENTRY_SIZE    2056
+#define STUB_MIPS_R3000_LINUX_ELF_ENTRY_ADLER32 0x089e93a4
+#define STUB_MIPS_R3000_LINUX_ELF_ENTRY_CRC32   0x5becc30b
 
-unsigned char stub_mips_r3000_linux_elf_entry[2115] = {
+unsigned char stub_mips_r3000_linux_elf_entry[2056] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   0,  1,  0,  8,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0020 */   0,  0,  3, 84,  0,  0,  0,  1,  0, 52,  0,  0,  0,  0,  0, 40,
@@ -94,80 +94,76 @@ unsigned char stub_mips_r3000_linux_elf_entry[2115] = {
 /* 0x0360 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0370 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,
 /* 0x0380 */   0,  0,  0,  1,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0, 52,
-/* 0x0390 */   0,  0,  1,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,
+/* 0x0390 */   0,  0,  1,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
 /* 0x03a0 */   0,  0,  0,  0,  0,  0,  0, 27,  0,  0,  0,  9,  0,  0,  0,  0,
-/* 0x03b0 */   0,  0,  0,  0,  0,  0,  5, 84,  0,  0,  0,  8,  0,  0,  0,  6,
+/* 0x03b0 */   0,  0,  0,  0,  0,  0,  5, 64,  0,  0,  0,  8,  0,  0,  0,  6,
 /* 0x03c0 */   0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  8,  0,  0,  0, 44,
-/* 0x03d0 */   0,  0,  0,  1,  0,  0,  0,  6,  0,  0,  1,116,  0,  0,  1,168,
+/* 0x03d0 */   0,  0,  0,  1,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  1,168,
 /* 0x03e0 */   0,  0,  1,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,
 /* 0x03f0 */   0,  0,  0,  0,  0,  0,  0, 40,  0,  0,  0,  9,  0,  0,  0,  0,
-/* 0x0400 */   0,  0,  0,  0,  0,  0,  5, 92,  0,  0,  0, 16,  0,  0,  0,  6,
+/* 0x0400 */   0,  0,  0,  0,  0,  0,  5, 72,  0,  0,  0, 16,  0,  0,  0,  6,
 /* 0x0410 */   0,  0,  0,  3,  0,  0,  0,  4,  0,  0,  0,  8,  0,  0,  0, 17,
 /* 0x0420 */   0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3, 28,
 /* 0x0430 */   0,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
 /* 0x0440 */   0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,
-/* 0x0450 */   0,  0,  0,  0,  0,  0,  4,148,  0,  0,  0,128,  0,  0,  0,  7,
+/* 0x0450 */   0,  0,  0,  0,  0,  0,  4,148,  0,  0,  0,112,  0,  0,  0,  7,
 /* 0x0460 */   0,  0,  0,  3,  0,  0,  0,  4,  0,  0,  0, 16,  0,  0,  0,  9,
-/* 0x0470 */   0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5, 20,
-/* 0x0480 */   0,  0,  0, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
+/* 0x0470 */   0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,
+/* 0x0480 */   0,  0,  0, 57,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
 /* 0x0490 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x04a0 */   0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x04b0 */   3,  0,  0,  1,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,
-/* 0x04c0 */   3,  0,  0,  3,  0,  0,  0, 19,  0,  0,  1, 56,  0,  0,  0,  0,
-/* 0x04d0 */   0,  0,  0,  3,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,
-/* 0x04e0 */  16,  0,  0,  0,  0,  0,  0, 32,  0,  0,  1, 16,  0,  0,  0,  0,
-/* 0x04f0 */  17,  0,  0,  3,  0,  0,  0, 42,  0,  0,  1,  0,  0,  0,  0,  0,
-/* 0x0500 */  17,  0,  0,  3,  0,  0,  0, 55,  0,  0,  0,  0,  0,  0,  0,  0,
-/* 0x0510 */  17,  0,  0,  1,  0, 69, 76, 70, 77, 65, 73, 78, 88,  0, 69, 76,
-/* 0x0520 */  70, 77, 65, 73, 78, 90,  0,109, 97,105,110,  0, 79, 95, 66, 73,
-/* 0x0530 */  78, 70, 79,  0,102,116,114,117,110, 99, 97,116,101,  0,109,101,
-/* 0x0540 */ 109,102,100, 95, 99,114,101, 97,116,101,  0, 95,115,116, 97,114,
-/* 0x0550 */ 116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2, 10,  0,  0,  0,128,
-/* 0x0560 */   0,  0,  1, 10,  0,  0,  1,112,  0,  0,  4,  2,102,105,108,101,
-/* 0x0570 */  32,102,111,114,109, 97,116, 32,101,108,102, 51, 50, 45, 98,105,
-/* 0x0580 */ 103,109,105,112,115, 10, 10, 83,101, 99,116,105,111,110,115, 58,
-/* 0x0590 */  10, 73,100,120, 32, 78, 97,109,101, 32, 32, 32, 32, 32, 32, 32,
-/* 0x05a0 */  32, 32, 32, 83,105,122,101, 32, 32, 32, 32, 32, 32, 86, 77, 65,
-/* 0x05b0 */  32, 32, 32, 32, 32, 32, 32, 76, 77, 65, 32, 32, 32, 32, 32, 32,
-/* 0x05c0 */  32, 70,105,108,101, 32,111,102,102, 32, 32, 65,108,103,110, 32,
-/* 0x05d0 */  32, 70,108, 97,103,115, 10, 32, 32, 48, 32, 69, 76, 70, 77, 65,
-/* 0x05e0 */  73, 78, 88, 32, 32, 32, 32, 32, 32, 48, 49, 55, 52, 32, 32, 48,
-/* 0x05f0 */  32, 32, 48, 32, 32, 48, 51, 52, 32, 32, 50, 42, 42, 50, 32, 32,
-/* 0x0600 */  67, 79, 78, 84, 69, 78, 84, 83, 10, 32, 32, 49, 32, 69, 76, 70,
-/* 0x0610 */  77, 65, 73, 78, 90, 32, 32, 32, 32, 32, 32, 48, 49, 55, 52, 32,
-/* 0x0620 */  32, 48, 49, 55, 52, 32, 32, 48, 49, 55, 52, 32, 32, 48, 49, 97,
-/* 0x0630 */  56, 32, 32, 50, 42, 42, 50, 32, 32, 67, 79, 78, 84, 69, 78, 84,
-/* 0x0640 */  83, 10, 83, 89, 77, 66, 79, 76, 32, 84, 65, 66, 76, 69, 58, 10,
-/* 0x0650 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
-/* 0x0660 */  32, 69, 76, 70, 77, 65, 73, 78, 88, 32, 48, 32, 69, 76, 70, 77,
-/* 0x0670 */  65, 73, 78, 88, 10, 48, 48, 48, 48, 48, 49, 55, 52, 32,108, 32,
-/* 0x0680 */  32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 48,
-/* 0x0690 */  32, 69, 76, 70, 77, 65, 73, 78, 90, 10, 48, 48, 48, 48, 48, 50,
-/* 0x06a0 */  97, 99, 32,108, 32, 32, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65,
-/* 0x06b0 */  73, 78, 90, 32, 48, 32,109, 97,105,110, 10, 48, 48, 48, 48, 48,
-/* 0x06c0 */  48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42, 85, 78, 68,
-/* 0x06d0 */  42, 32, 48, 32, 79, 95, 66, 73, 78, 70, 79, 10, 48, 48, 48, 48,
-/* 0x06e0 */  48, 50, 56, 52, 32,103, 32, 32, 32, 32, 32, 79, 32, 69, 76, 70,
-/* 0x06f0 */  77, 65, 73, 78, 90, 32, 48, 32,102,116,114,117,110, 99, 97,116,
-/* 0x0700 */ 101, 10, 48, 48, 48, 48, 48, 50, 55, 52, 32,103, 32, 32, 32, 32,
-/* 0x0710 */  32, 79, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 48, 32,109,101,
-/* 0x0720 */ 109,102,100, 95, 99,114,101, 97,116,101, 10, 48, 48, 48, 48, 48,
-/* 0x0730 */  48, 48, 48, 32,103, 32, 32, 32, 32, 32, 79, 32, 69, 76, 70, 77,
-/* 0x0740 */  65, 73, 78, 88, 32, 48, 32, 95,115,116, 97,114,116, 10, 10, 82,
-/* 0x0750 */  69, 76, 79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68,
-/* 0x0760 */  83, 32, 70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78, 88, 93,
-/* 0x0770 */  58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 84, 89, 80, 69, 32,
-/* 0x0780 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76,
-/* 0x0790 */  85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32, 82, 95, 77, 73,
-/* 0x07a0 */  80, 83, 95, 80, 67, 49, 54, 32, 32, 32, 32, 32, 32, 32, 69, 76,
-/* 0x07b0 */  70, 77, 65, 73, 78, 90, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73,
-/* 0x07c0 */  79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91,
-/* 0x07d0 */  69, 76, 70, 77, 65, 73, 78, 90, 93, 58, 10, 79, 70, 70, 83, 69,
-/* 0x07e0 */  84, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x07f0 */  32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48,
-/* 0x0800 */  48, 48, 56, 48, 32, 82, 95, 77, 73, 80, 83, 95, 80, 67, 49, 54,
-/* 0x0810 */  32, 32, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 88, 10,
-/* 0x0820 */  48, 48, 48, 48, 48, 49, 55, 48, 32, 82, 95, 77, 73, 80, 83, 95,
-/* 0x0830 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79, 95, 66, 73, 78,
-/* 0x0840 */  70, 79, 10
+/* 0x04c0 */   3,  0,  0,  3,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  0,
+/* 0x04d0 */  17,  0,  0,  1,  0,  0,  0, 26,  0,  0,  1,  0,  0,  0,  0,  0,
+/* 0x04e0 */  17,  0,  0,  3,  0,  0,  0, 39,  0,  0,  1, 16,  0,  0,  0,  0,
+/* 0x04f0 */  17,  0,  0,  3,  0,  0,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,
+/* 0x0500 */  16,  0,  0,  0,  0, 69, 76, 70, 77, 65, 73, 78, 88,  0, 69, 76,
+/* 0x0510 */  70, 77, 65, 73, 78, 90,  0, 95,115,116, 97,114,116,  0,109,101,
+/* 0x0520 */ 109,102,100, 95, 99,114,101, 97,116,101,  0,102,116,114,117,110,
+/* 0x0530 */  99, 97,116,101,  0, 79, 95, 66, 73, 78, 70, 79,  0,  0,  0,  0,
+/* 0x0540 */   0,  0,  0,  0,  0,  0,  2, 10,  0,  0,  0,128,  0,  0,  1, 10,
+/* 0x0550 */   0,  0,  1,112,  0,  0,  6,  2,102,105,108,101, 32,102,111,114,
+/* 0x0560 */ 109, 97,116, 32,101,108,102, 51, 50, 45, 98,105,103,109,105,112,
+/* 0x0570 */ 115, 10, 10, 83,101, 99,116,105,111,110,115, 58, 10, 73,100,120,
+/* 0x0580 */  32, 78, 97,109,101, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,
+/* 0x0590 */ 105,122,101, 32, 32, 32, 32, 32, 32, 86, 77, 65, 32, 32, 32, 32,
+/* 0x05a0 */  32, 32, 32, 76, 77, 65, 32, 32, 32, 32, 32, 32, 32, 70,105,108,
+/* 0x05b0 */ 101, 32,111,102,102, 32, 32, 65,108,103,110, 32, 32, 70,108, 97,
+/* 0x05c0 */ 103,115, 10, 32, 32, 48, 32, 69, 76, 70, 77, 65, 73, 78, 88, 32,
+/* 0x05d0 */  32, 32, 32, 32, 32, 48, 49, 55, 52, 32, 32, 48, 32, 32, 48, 32,
+/* 0x05e0 */  32, 48, 51, 52, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84,
+/* 0x05f0 */  69, 78, 84, 83, 10, 32, 32, 49, 32, 69, 76, 70, 77, 65, 73, 78,
+/* 0x0600 */  90, 32, 32, 32, 32, 32, 32, 48, 49, 55, 52, 32, 32, 48, 32, 32,
+/* 0x0610 */  48, 32, 32, 48, 49, 97, 56, 32, 32, 50, 42, 42, 50, 32, 32, 67,
+/* 0x0620 */  79, 78, 84, 69, 78, 84, 83, 10, 83, 89, 77, 66, 79, 76, 32, 84,
+/* 0x0630 */  65, 66, 76, 69, 58, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32,108,
+/* 0x0640 */  32, 32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 88, 32,
+/* 0x0650 */  48, 32, 69, 76, 70, 77, 65, 73, 78, 88, 10, 48, 48, 48, 48, 48,
+/* 0x0660 */  48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 69, 76, 70, 77,
+/* 0x0670 */  65, 73, 78, 90, 32, 48, 32, 69, 76, 70, 77, 65, 73, 78, 90, 10,
+/* 0x0680 */  48, 48, 48, 48, 48, 48, 48, 48, 32,103, 32, 32, 32, 32, 32, 79,
+/* 0x0690 */  32, 69, 76, 70, 77, 65, 73, 78, 88, 32, 48, 32, 95,115,116, 97,
+/* 0x06a0 */ 114,116, 10, 48, 48, 48, 48, 48, 49, 48, 48, 32,103, 32, 32, 32,
+/* 0x06b0 */  32, 32, 79, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 48, 32,109,
+/* 0x06c0 */ 101,109,102,100, 95, 99,114,101, 97,116,101, 10, 48, 48, 48, 48,
+/* 0x06d0 */  48, 49, 49, 48, 32,103, 32, 32, 32, 32, 32, 79, 32, 69, 76, 70,
+/* 0x06e0 */  77, 65, 73, 78, 90, 32, 48, 32,102,116,114,117,110, 99, 97,116,
+/* 0x06f0 */ 101, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32,
+/* 0x0700 */  32, 32, 32, 42, 85, 78, 68, 42, 32, 48, 32, 79, 95, 66, 73, 78,
+/* 0x0710 */  70, 79, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32, 82,
+/* 0x0720 */  69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 69, 76, 70, 77,
+/* 0x0730 */  65, 73, 78, 88, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32,
+/* 0x0740 */  84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x0750 */  32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x0760 */  32, 82, 95, 77, 73, 80, 83, 95, 80, 67, 49, 54, 32, 32, 32, 32,
+/* 0x0770 */  32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90, 10, 10, 82, 69, 76,
+/* 0x0780 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
+/* 0x0790 */  70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78, 90, 93, 58, 10,
+/* 0x07a0 */  79, 70, 70, 83, 69, 84, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32,
+/* 0x07b0 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69,
+/* 0x07c0 */  10, 48, 48, 48, 48, 48, 48, 56, 48, 32, 82, 95, 77, 73, 80, 83,
+/* 0x07d0 */  95, 80, 67, 49, 54, 32, 32, 32, 32, 32, 32, 32, 69, 76, 70, 77,
+/* 0x07e0 */  65, 73, 78, 88, 10, 48, 48, 48, 48, 48, 49, 55, 48, 32, 82, 95,
+/* 0x07f0 */  77, 73, 80, 83, 95, 51, 50, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x0800 */  79, 95, 66, 73, 78, 70, 79, 10
 };
diff --git a/src/stub/mipsel.r3000-linux.elf-entry.h b/src/stub/mipsel.r3000-linux.elf-entry.h
index 9dedd35d..3a717167 100644
--- a/src/stub/mipsel.r3000-linux.elf-entry.h
+++ b/src/stub/mipsel.r3000-linux.elf-entry.h
@@ -1,5 +1,5 @@
 /* mipsel.r3000-linux.elf-entry.h
-   created from mipsel.r3000-linux.elf-entry.bin, 2072 (0x818) bytes
+   created from mipsel.r3000-linux.elf-entry.bin, 2019 (0x7e3) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -32,11 +32,11 @@
 
 /* clang-format off */
 
-#define STUB_MIPSEL_R3000_LINUX_ELF_ENTRY_SIZE    2072
-#define STUB_MIPSEL_R3000_LINUX_ELF_ENTRY_ADLER32 0xecf897e7
-#define STUB_MIPSEL_R3000_LINUX_ELF_ENTRY_CRC32   0xfc218051
+#define STUB_MIPSEL_R3000_LINUX_ELF_ENTRY_SIZE    2019
+#define STUB_MIPSEL_R3000_LINUX_ELF_ENTRY_ADLER32 0x06d58e22
+#define STUB_MIPSEL_R3000_LINUX_ELF_ENTRY_CRC32   0xb73c9937
 
-unsigned char stub_mipsel_r3000_linux_elf_entry[2072] = {
+unsigned char stub_mipsel_r3000_linux_elf_entry[2019] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   1,  0,  8,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0020 */  44,  3,  0,  0,  1,  0,  0,  0, 52,  0,  0,  0,  0,  0, 40,  0,
@@ -93,78 +93,75 @@ unsigned char stub_mipsel_r3000_linux_elf_entry[2072] = {
 /* 0x0350 */   0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,  6,  0,  0,  0,
 /* 0x0360 */   0,  0,  0,  0, 52,  0,  0,  0, 76,  1,  0,  0,  0,  0,  0,  0,
 /* 0x0370 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 27,  0,  0,  0,
-/* 0x0380 */   9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 44,  5,  0,  0,
+/* 0x0380 */   9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  5,  0,  0,
 /* 0x0390 */   8,  0,  0,  0,  6,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,
 /* 0x03a0 */   8,  0,  0,  0, 44,  0,  0,  0,  1,  0,  0,  0,  6,  0,  0,  0,
 /* 0x03b0 */   0,  0,  0,  0,128,  1,  0,  0,116,  1,  0,  0,  0,  0,  0,  0,
 /* 0x03c0 */   0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0, 40,  0,  0,  0,
-/* 0x03d0 */   9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 52,  5,  0,  0,
+/* 0x03d0 */   9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  5,  0,  0,
 /* 0x03e0 */  16,  0,  0,  0,  6,  0,  0,  0,  3,  0,  0,  0,  4,  0,  0,  0,
 /* 0x03f0 */   8,  0,  0,  0, 17,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0400 */   0,  0,  0,  0,244,  2,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0410 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
 /* 0x0420 */   2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,108,  4,  0,  0,
-/* 0x0430 */ 128,  0,  0,  0,  7,  0,  0,  0,  3,  0,  0,  0,  4,  0,  0,  0,
+/* 0x0430 */ 112,  0,  0,  0,  7,  0,  0,  0,  3,  0,  0,  0,  4,  0,  0,  0,
 /* 0x0440 */  16,  0,  0,  0,  9,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
-/* 0x0450 */   0,  0,  0,  0,236,  4,  0,  0, 62,  0,  0,  0,  0,  0,  0,  0,
+/* 0x0450 */   0,  0,  0,  0,220,  4,  0,  0, 57,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0460 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0470 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
 /* 0x0480 */   0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  1,  0, 10,  0,  0,  0,
 /* 0x0490 */   0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  3,  0, 19,  0,  0,  0,
 /* 0x04a0 */   0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  1,  0, 26,  0,  0,  0,
-/* 0x04b0 */  56,  1,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0, 31,  0,  0,  0,
-/* 0x04c0 */   0,  1,  0,  0,  0,  0,  0,  0, 17,  0,  3,  0, 44,  0,  0,  0,
-/* 0x04d0 */  16,  1,  0,  0,  0,  0,  0,  0, 17,  0,  3,  0, 54,  0,  0,  0,
-/* 0x04e0 */   0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 69, 76, 70,
-/* 0x04f0 */  77, 65, 73, 78, 88,  0, 69, 76, 70, 77, 65, 73, 78, 90,  0, 95,
-/* 0x0500 */ 115,116, 97,114,116,  0,109, 97,105,110,  0,109,101,109,102,100,
-/* 0x0510 */  95, 99,114,101, 97,116,101,  0,102,116,114,117,110, 99, 97,116,
-/* 0x0520 */ 101,  0, 79, 95, 66, 73, 78, 70, 79,  0,  0,  0,  0,  0,  0,  0,
-/* 0x0530 */  10,  2,  0,  0,128,  0,  0,  0, 10,  1,  0,  0,112,  1,  0,  0,
-/* 0x0540 */   2,  7,  0,  0,102,105,108,101, 32,102,111,114,109, 97,116, 32,
-/* 0x0550 */ 101,108,102, 51, 50, 45,108,105,116,116,108,101,109,105,112,115,
-/* 0x0560 */  10, 10, 83,101, 99,116,105,111,110,115, 58, 10, 73,100,120, 32,
-/* 0x0570 */  78, 97,109,101, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,105,
-/* 0x0580 */ 122,101, 32, 32, 32, 32, 32, 32, 86, 77, 65, 32, 32, 32, 32, 32,
-/* 0x0590 */  32, 32, 76, 77, 65, 32, 32, 32, 32, 32, 32, 32, 70,105,108,101,
-/* 0x05a0 */  32,111,102,102, 32, 32, 65,108,103,110, 32, 32, 70,108, 97,103,
-/* 0x05b0 */ 115, 10, 32, 32, 48, 32, 69, 76, 70, 77, 65, 73, 78, 88, 32, 32,
-/* 0x05c0 */  32, 32, 32, 32, 48, 49, 52, 99, 32, 32, 48, 32, 32, 48, 32, 32,
-/* 0x05d0 */  48, 51, 52, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69,
-/* 0x05e0 */  78, 84, 83, 10, 32, 32, 49, 32, 69, 76, 70, 77, 65, 73, 78, 90,
-/* 0x05f0 */  32, 32, 32, 32, 32, 32, 48, 49, 55, 52, 32, 32, 48, 32, 32, 48,
-/* 0x0600 */  32, 32, 48, 49, 56, 48, 32, 32, 50, 42, 42, 50, 32, 32, 67, 79,
-/* 0x0610 */  78, 84, 69, 78, 84, 83, 10, 83, 89, 77, 66, 79, 76, 32, 84, 65,
-/* 0x0620 */  66, 76, 69, 58, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32,
-/* 0x0630 */  32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 88, 32, 48,
-/* 0x0640 */  32, 69, 76, 70, 77, 65, 73, 78, 88, 10, 48, 48, 48, 48, 48, 48,
-/* 0x0650 */  48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65,
-/* 0x0660 */  73, 78, 90, 32, 48, 32, 69, 76, 70, 77, 65, 73, 78, 90, 10, 48,
-/* 0x0670 */  48, 48, 48, 48, 48, 48, 48, 32,103, 32, 32, 32, 32, 32, 79, 32,
-/* 0x0680 */  69, 76, 70, 77, 65, 73, 78, 88, 32, 48, 32, 95,115,116, 97,114,
-/* 0x0690 */ 116, 10, 48, 48, 48, 48, 48, 49, 51, 56, 32,108, 32, 32, 32, 32,
-/* 0x06a0 */  32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 48, 32,109, 97,
-/* 0x06b0 */ 105,110, 10, 48, 48, 48, 48, 48, 49, 48, 48, 32,103, 32, 32, 32,
-/* 0x06c0 */  32, 32, 79, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 48, 32,109,
-/* 0x06d0 */ 101,109,102,100, 95, 99,114,101, 97,116,101, 10, 48, 48, 48, 48,
-/* 0x06e0 */  48, 49, 49, 48, 32,103, 32, 32, 32, 32, 32, 79, 32, 69, 76, 70,
-/* 0x06f0 */  77, 65, 73, 78, 90, 32, 48, 32,102,116,114,117,110, 99, 97,116,
-/* 0x0700 */ 101, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32,
-/* 0x0710 */  32, 32, 32, 42, 85, 78, 68, 42, 32, 48, 32, 79, 95, 66, 73, 78,
-/* 0x0720 */  70, 79, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32, 82,
-/* 0x0730 */  69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 69, 76, 70, 77,
-/* 0x0740 */  65, 73, 78, 88, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32,
-/* 0x0750 */  84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x0760 */  32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x0770 */  32, 82, 95, 77, 73, 80, 83, 95, 80, 67, 49, 54, 32, 32, 32, 32,
-/* 0x0780 */  32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90, 10, 10, 82, 69, 76,
-/* 0x0790 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
-/* 0x07a0 */  70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78, 90, 93, 58, 10,
-/* 0x07b0 */  79, 70, 70, 83, 69, 84, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32,
-/* 0x07c0 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69,
-/* 0x07d0 */  10, 48, 48, 48, 48, 48, 48, 56, 48, 32, 82, 95, 77, 73, 80, 83,
-/* 0x07e0 */  95, 80, 67, 49, 54, 32, 32, 32, 32, 32, 32, 32, 69, 76, 70, 77,
-/* 0x07f0 */  65, 73, 78, 88, 10, 48, 48, 48, 48, 48, 49, 55, 48, 32, 82, 95,
-/* 0x0800 */  77, 73, 80, 83, 95, 51, 50, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x0810 */  79, 95, 66, 73, 78, 70, 79, 10
+/* 0x04b0 */   0,  1,  0,  0,  0,  0,  0,  0, 17,  0,  3,  0, 39,  0,  0,  0,
+/* 0x04c0 */  16,  1,  0,  0,  0,  0,  0,  0, 17,  0,  3,  0, 49,  0,  0,  0,
+/* 0x04d0 */   0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 69, 76, 70,
+/* 0x04e0 */  77, 65, 73, 78, 88,  0, 69, 76, 70, 77, 65, 73, 78, 90,  0, 95,
+/* 0x04f0 */ 115,116, 97,114,116,  0,109,101,109,102,100, 95, 99,114,101, 97,
+/* 0x0500 */ 116,101,  0,102,116,114,117,110, 99, 97,116,101,  0, 79, 95, 66,
+/* 0x0510 */  73, 78, 70, 79,  0,  0,  0,  0,  0,  0,  0,  0, 10,  2,  0,  0,
+/* 0x0520 */ 128,  0,  0,  0, 10,  1,  0,  0,112,  1,  0,  0,  2,  6,  0,  0,
+/* 0x0530 */ 102,105,108,101, 32,102,111,114,109, 97,116, 32,101,108,102, 51,
+/* 0x0540 */  50, 45,108,105,116,116,108,101,109,105,112,115, 10, 10, 83,101,
+/* 0x0550 */  99,116,105,111,110,115, 58, 10, 73,100,120, 32, 78, 97,109,101,
+/* 0x0560 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 83,105,122,101, 32, 32,
+/* 0x0570 */  32, 32, 32, 32, 86, 77, 65, 32, 32, 32, 32, 32, 32, 32, 76, 77,
+/* 0x0580 */  65, 32, 32, 32, 32, 32, 32, 32, 70,105,108,101, 32,111,102,102,
+/* 0x0590 */  32, 32, 65,108,103,110, 32, 32, 70,108, 97,103,115, 10, 32, 32,
+/* 0x05a0 */  48, 32, 69, 76, 70, 77, 65, 73, 78, 88, 32, 32, 32, 32, 32, 32,
+/* 0x05b0 */  48, 49, 52, 99, 32, 32, 48, 32, 32, 48, 32, 32, 48, 51, 52, 32,
+/* 0x05c0 */  32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 10,
+/* 0x05d0 */  32, 32, 49, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 32, 32, 32,
+/* 0x05e0 */  32, 32, 48, 49, 55, 52, 32, 32, 48, 32, 32, 48, 32, 32, 48, 49,
+/* 0x05f0 */  56, 48, 32, 32, 50, 42, 42, 50, 32, 32, 67, 79, 78, 84, 69, 78,
+/* 0x0600 */  84, 83, 10, 83, 89, 77, 66, 79, 76, 32, 84, 65, 66, 76, 69, 58,
+/* 0x0610 */  10, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100,
+/* 0x0620 */  32, 32, 69, 76, 70, 77, 65, 73, 78, 88, 32, 48, 32, 69, 76, 70,
+/* 0x0630 */  77, 65, 73, 78, 88, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32,108,
+/* 0x0640 */  32, 32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32,
+/* 0x0650 */  48, 32, 69, 76, 70, 77, 65, 73, 78, 90, 10, 48, 48, 48, 48, 48,
+/* 0x0660 */  48, 48, 48, 32,103, 32, 32, 32, 32, 32, 79, 32, 69, 76, 70, 77,
+/* 0x0670 */  65, 73, 78, 88, 32, 48, 32, 95,115,116, 97,114,116, 10, 48, 48,
+/* 0x0680 */  48, 48, 48, 49, 48, 48, 32,103, 32, 32, 32, 32, 32, 79, 32, 69,
+/* 0x0690 */  76, 70, 77, 65, 73, 78, 90, 32, 48, 32,109,101,109,102,100, 95,
+/* 0x06a0 */  99,114,101, 97,116,101, 10, 48, 48, 48, 48, 48, 49, 49, 48, 32,
+/* 0x06b0 */ 103, 32, 32, 32, 32, 32, 79, 32, 69, 76, 70, 77, 65, 73, 78, 90,
+/* 0x06c0 */  32, 48, 32,102,116,114,117,110, 99, 97,116,101, 10, 48, 48, 48,
+/* 0x06d0 */  48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42, 85,
+/* 0x06e0 */  78, 68, 42, 32, 48, 32, 79, 95, 66, 73, 78, 70, 79, 10, 10, 82,
+/* 0x06f0 */  69, 76, 79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68,
+/* 0x0700 */  83, 32, 70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78, 88, 93,
+/* 0x0710 */  58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 84, 89, 80, 69, 32,
+/* 0x0720 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76,
+/* 0x0730 */  85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 32, 82, 95, 77, 73,
+/* 0x0740 */  80, 83, 95, 80, 67, 49, 54, 32, 32, 32, 32, 32, 32, 32, 69, 76,
+/* 0x0750 */  70, 77, 65, 73, 78, 90, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73,
+/* 0x0760 */  79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91,
+/* 0x0770 */  69, 76, 70, 77, 65, 73, 78, 90, 93, 58, 10, 79, 70, 70, 83, 69,
+/* 0x0780 */  84, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x0790 */  32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48,
+/* 0x07a0 */  48, 48, 56, 48, 32, 82, 95, 77, 73, 80, 83, 95, 80, 67, 49, 54,
+/* 0x07b0 */  32, 32, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 88, 10,
+/* 0x07c0 */  48, 48, 48, 48, 48, 49, 55, 48, 32, 82, 95, 77, 73, 80, 83, 95,
+/* 0x07d0 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79, 95, 66, 73, 78,
+/* 0x07e0 */  70, 79, 10
 };
diff --git a/src/stub/tmp/mips.r3000-linux.elf-entry.bin.dump b/src/stub/tmp/mips.r3000-linux.elf-entry.bin.dump
index 113469cb..ddfa0264 100644
--- a/src/stub/tmp/mips.r3000-linux.elf-entry.bin.dump
+++ b/src/stub/tmp/mips.r3000-linux.elf-entry.bin.dump
@@ -2,15 +2,15 @@ file format elf32-bigmips
 
 Sections:
 Idx Name          Size      VMA       LMA       File off  Algn  Flags
-  0 ELFMAINX      0174  0  0  034  2**2  CONTENTS
-  1 ELFMAINZ      0174  0174  0174  01a8  2**2  CONTENTS
+  0 ELFMAINX      0174  0  0  034  2**0  CONTENTS
+  1 ELFMAINZ      0174  0  0  01a8  2**2  CONTENTS
 SYMBOL TABLE:
 00000000 l    d  ELFMAINX 0 ELFMAINX
-00000174 l    d  ELFMAINZ 0 ELFMAINZ
-00000000         *UND* 0 O_BINFO
-00000284 g     O ELFMAINZ 0 ftruncate
-00000274 g     O ELFMAINZ 0 memfd_create
+00000000 l    d  ELFMAINZ 0 ELFMAINZ
 00000000 g     O ELFMAINX 0 _start
+00000100 g     O ELFMAINZ 0 memfd_create
+00000110 g     O ELFMAINZ 0 ftruncate
+00000000         *UND* 0 O_BINFO
 
 RELOCATION RECORDS FOR [ELFMAINX]:
 OFFSET   TYPE              VALUE
diff --git a/src/stub/tmp/mips.r3000-linux.elf-fold.map b/src/stub/tmp/mips.r3000-linux.elf-fold.map
index 44888686..9111eaf0 100644
--- a/src/stub/tmp/mips.r3000-linux.elf-fold.map
+++ b/src/stub/tmp/mips.r3000-linux.elf-fold.map
@@ -7,11 +7,11 @@ Name             Origin             Length             Attributes
 Linker script and memory map
 
 
-.text           0x0000000000000000      0xd68
- .text          0x0000000000000000      0xd68 tmp/mips.r3000-linux.elf-fold.o
+.text           0x0000000000000000      0xd60
+ .text          0x0000000000000000      0xd60 tmp/mips.r3000-linux.elf-fold.o
                 0x00000000000000d0                get_page_mask
                 0x00000000000000f0                get_upxfn_path
-                0x0000000000000cfc                underlay
+                0x0000000000000cf4                underlay
                 0x0000000000000b64                upx_main
                 0x0000000000000010                get4unal
                 0x0000000000000128                close
@@ -49,8 +49,8 @@ HUMF_A          0x0000000000000000        0x8
 HUMF_L          0x0000000000000000        0x8
  HUMF_L         0x0000000000000000        0x8 tmp/mips.r3000-linux.elf-fold.o
 
-UMF_LINUX       0x0000000000000000      0x130
- UMF_LINUX      0x0000000000000000      0x130 tmp/mips.r3000-linux.elf-fold.o
+UMF_LINUX       0x0000000000000000      0x10c
+ UMF_LINUX      0x0000000000000000      0x10c tmp/mips.r3000-linux.elf-fold.o
                 0x0000000000000000                upx_mmap_and_fd_linux
 
 EXP_HEAD        0x0000000000000000       0xfc
diff --git a/src/stub/tmp/mipsel.r3000-linux.elf-entry.bin.dump b/src/stub/tmp/mipsel.r3000-linux.elf-entry.bin.dump
index 86ea0ba2..d241c6dd 100644
--- a/src/stub/tmp/mipsel.r3000-linux.elf-entry.bin.dump
+++ b/src/stub/tmp/mipsel.r3000-linux.elf-entry.bin.dump
@@ -2,15 +2,15 @@ file format elf32-littlemips
 
 Sections:
 Idx Name          Size      VMA       LMA       File off  Algn  Flags
-  0 ELFMAINX      014c  0  0  034  2**2  CONTENTS
-  1 ELFMAINZ      0174  014c  014c  0180  2**2  CONTENTS
+  0 ELFMAINX      014c  0  0  034  2**0  CONTENTS
+  1 ELFMAINZ      0174  0  0  0180  2**2  CONTENTS
 SYMBOL TABLE:
 00000000 l    d  ELFMAINX 0 ELFMAINX
-0000014c l    d  ELFMAINZ 0 ELFMAINZ
-00000000         *UND* 0 O_BINFO
-0000025c g     O ELFMAINZ 0 ftruncate
-0000024c g     O ELFMAINZ 0 memfd_create
+00000000 l    d  ELFMAINZ 0 ELFMAINZ
 00000000 g     O ELFMAINX 0 _start
+00000100 g     O ELFMAINZ 0 memfd_create
+00000110 g     O ELFMAINZ 0 ftruncate
+00000000         *UND* 0 O_BINFO
 
 RELOCATION RECORDS FOR [ELFMAINX]:
 OFFSET   TYPE              VALUE
diff --git a/src/stub/tmp/mipsel.r3000-linux.elf-fold.map b/src/stub/tmp/mipsel.r3000-linux.elf-fold.map
index e10ebc53..30285347 100644
--- a/src/stub/tmp/mipsel.r3000-linux.elf-fold.map
+++ b/src/stub/tmp/mipsel.r3000-linux.elf-fold.map
@@ -7,11 +7,11 @@ Name             Origin             Length             Attributes
 Linker script and memory map
 
 
-.text           0x0000000000000000      0xd58
- .text          0x0000000000000000      0xd58 tmp/mipsel.r3000-linux.elf-fold.o
+.text           0x0000000000000000      0xd50
+ .text          0x0000000000000000      0xd50 tmp/mipsel.r3000-linux.elf-fold.o
                 0x00000000000000d0                get_page_mask
                 0x00000000000000f0                get_upxfn_path
-                0x0000000000000cec                underlay
+                0x0000000000000ce4                underlay
                 0x0000000000000b54                upx_main
                 0x0000000000000010                get4unal
                 0x0000000000000128                close
@@ -49,8 +49,8 @@ HUMF_A          0x0000000000000000        0x8
 HUMF_L          0x0000000000000000        0x8
  HUMF_L         0x0000000000000000        0x8 tmp/mipsel.r3000-linux.elf-fold.o
 
-UMF_LINUX       0x0000000000000000      0x130
- UMF_LINUX      0x0000000000000000      0x130 tmp/mipsel.r3000-linux.elf-fold.o
+UMF_LINUX       0x0000000000000000      0x10c
+ UMF_LINUX      0x0000000000000000      0x10c tmp/mipsel.r3000-linux.elf-fold.o
                 0x0000000000000000                upx_mmap_and_fd_linux
 
 EXP_HEAD        0x0000000000000000       0xfc