diff --git a/src/stub/src/mips.r3000-linux.elf-entry.S b/src/stub/src/mips.r3000-linux.elf-entry.S
index f1f520fb..b2221123 100644
--- a/src/stub/src/mips.r3000-linux.elf-entry.S
+++ b/src/stub/src/mips.r3000-linux.elf-entry.S
@@ -1,5 +1,3 @@
 #define BIG_ENDIAN 1
-WITHOUT_SUB = 1
-UCL_SMALL = 1
 
 #include "mipsel.r3000-linux.elf-entry.S"
diff --git a/src/stub/src/mipsel.r3000-linux.elf-entry.S b/src/stub/src/mipsel.r3000-linux.elf-entry.S
index 58ef8cfa..a6d76e31 100644
--- a/src/stub/src/mipsel.r3000-linux.elf-entry.S
+++ b/src/stub/src/mipsel.r3000-linux.elf-entry.S
@@ -32,6 +32,10 @@
 #include "arch/mips/mipsel.r3000/macros.ash"
 #include "arch/mips/mipsel.r3000/bits.ash"
 
+#ifndef BIG_ENDIAN
+# define BIG_ENDIAN 0
+#endif
+
         .set mips1
         .set noreorder
         .set noat
@@ -104,17 +108,19 @@ decompressor:  // (uchar const *lxsrc, size_t lxsrclen, uchar *lxdst, u32 &lxdst
 #undef dst  /* bits.ash */
 #define dst     lxdst
 
+        UCL_init    32,1,0
+        decomp_done = eof
 #include "arch/mips/mipsel.r3000/nrv2e_d.ash"
   section NRV2E
-        nrv2e eof
+        build nrv2e, full
 
 #include "arch/mips/mipsel.r3000/nrv2d_d.ash"
   section NRV2D
-        nrv2d eof
+        build nrv2d, full
 
 #include "arch/mips/mipsel.r3000/nrv2b_d.ash"
   section NRV2B
-        nrv2b eof
+        build nrv2b, full
 
 section     LZMA_ELF00 # (a0=lxsrc, a1=lxsrclen, a2=lxdst, a3= &lxdstlen)
 
diff --git a/src/stub/src/mipsel.r3000-ps1.S b/src/stub/src/mipsel.r3000-ps1.S
index c03c07e4..6c80c280 100644
--- a/src/stub/src/mipsel.r3000-ps1.S
+++ b/src/stub/src/mipsel.r3000-ps1.S
@@ -296,36 +296,36 @@ section     memset.long
 
             UCL_init    8,0,1
 section     nrv2b.8bit
-            build full, nrv2b
+            build nrv2b, full
 section     nrv2d.8bit
-            build full, nrv2d
+            build nrv2d, full
 section     nrv2e.8bit
-            build full, nrv2e
+            build nrv2e, full
 
             UCL_init    32,0,1
 section     nrv2b.32bit
-            build full, nrv2b
+            build nrv2b, full
 section     nrv2d.32bit
-            build full, nrv2d
+            build nrv2d, full
 section     nrv2e.32bit
-            build full, nrv2e
+            build nrv2e, full
 
 // ========== console-run
 
             UCL_init    8,1,0
 section     8bit.sub
-            build sub_only, 0, gb8_e
+            build 0, sub_only, gb8_e
 
             UCL_init    32,1,0
 section     32bit.sub
-            build sub_only, 0, gb32_e
+            build 0, sub_only, gb32_e
 
 section     nrv2b.small
-            build without_sub, nrv2b
+            build nrv2b, without_sub
 section     nrv2d.small
-            build without_sub, nrv2d
+            build nrv2d, without_sub
 section     nrv2e.small
-            build without_sub, nrv2e
+            build nrv2e, without_sub
 
 section     nrv.done
 decomp_done: