diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0952daf0f5f..c9ed98b9989 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-15  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* config/tc-mips.c (match_int_operand): Call
+	`match_out_of_range' before returning failure for 0x8000-0xffff
+	values conditionally allowed.
+
 2017-05-15  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* config/tc-mips.c (match_int_operand): Call
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 3dc6a53d91c..beb4d4673a8 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -5102,7 +5102,10 @@ match_int_operand (struct mips_arg_info *arg,
 	{
 	  max_val = ((1 << operand_base->size) - 1) << operand->shift;
 	  if (!arg->lax_match && sval <= max_val)
-	    return FALSE;
+	    {
+	      match_out_of_range (arg);
+	      return FALSE;
+	    }
 	}
     }
   else