diff --git a/src/stub/Makefile b/src/stub/Makefile
index 4643f302..203d4667 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -621,8 +621,7 @@ mipsel.r3000-ps1.h : tc_bfdname = elf32-littlemips
 
 tc.mipsel.r3000-ps1.as   = mipsel-elf-as-20060406 -O -mno-pdr
 ##tc.mipsel.r3000-ps1.as   = mipsel-linux-as-2.16.1 -O -mno-pdr
-##tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
-tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.2.0 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
+tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
 tc.mipsel.r3000-ps1.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
 tc.mipsel.r3000-ps1.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror
 
diff --git a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
index faf2c96e..c5319959 100644
--- a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
+++ b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
@@ -55,10 +55,10 @@ $c += -fmodulo-sched
 $c += -floop-optimize2
 $c += -ffixed-30
 else ifneq ($(findstring -gcc-4.2.0,$(firstword $($c))),)
-# gcc-4.2.0-20060826
+# gcc-4.2.0-20060826 snapshot
+$c += -fno-wrapv
 $c += -mtune=r4000
 $c += -fno-regmove
-$c += -fno-wrapv
 $c += -fno-sched-spec
 $c += -fno-schedule-insns
 $c += -fno-schedule-insns2