diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8c670869cf..312ba18e77 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-07  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* mips-tdep.c (mips32_scan_prologue): Only update the immediate
+	load adjustment if still within the prologue.
+
 2011-12-06  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* mips-tdep.c (mips32_next_pc): Fix floating point condition
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index bbfd7e9e60..64b7629b12 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -2246,7 +2246,8 @@ restart:
                    || high_word == 0x3408 /* ori $t0,$zero,n */
                   ))
        {
-          load_immediate_bytes += MIPS_INSN32_SIZE;     	/* FIXME!  */
+	 if (end_prologue_addr == 0)
+	   load_immediate_bytes += MIPS_INSN32_SIZE;		/* FIXME!  */
        }
       else
        {