diff --git a/gas/ChangeLog b/gas/ChangeLog
index e4ebf0e9e46..408a2872713 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-22  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	* config/tc-arm.c (v7m_psrs): Remove BASEPRI_MASK MRS/MSR special
+	register and redundant basepri_max.
+
 2016-09-21  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/tc-aarch64.c (print_operands): Print spaces between
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 6482ef95aba..db6dd681358 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -18813,7 +18813,6 @@ static const struct asm_psr v7m_psrs[] =
   {"primask",	   0x10}, {"PRIMASK",	   0x10},
   {"basepri",	   0x11}, {"BASEPRI",	   0x11},
   {"basepri_max",  0x12}, {"BASEPRI_MAX",  0x12},
-  {"basepri_max",  0x12}, {"BASEPRI_MASK", 0x12}, /* Typo, preserved for backwards compatibility.  */
   {"faultmask",	   0x13}, {"FAULTMASK",	   0x13},
   {"control",	   0x14}, {"CONTROL",	   0x14},
   {"msp_ns",	   0x88}, {"MSP_NS",	   0x88},