diff --git a/gas/ChangeLog b/gas/ChangeLog
index d1d23fe23d..fba1ab9de1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-18  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* config/tc-arc.c (find_opcode_match): Remove casting away of
+	const.
+	* config/tc-arc.h (struct arc_flags): Make flgp field const.
+
 2016-05-18  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* config/tc-arc.c (md_pcrel_from_section): Use BFD_VMA_FMT where
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 5a5e8531f7..c9d772f150 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -1883,7 +1883,7 @@ find_opcode_match (const struct arc_opcode_hash_entry *entry,
 		      if (pflag->flgp != NULL)
 			goto match_failed;
 		      cl_matches++;
-		      pflag->flgp = (struct arc_flag_operand *) flg_operand;
+		      pflag->flgp = flg_operand;
 		      lnflg--;
 		      break; /* goto next flag class and parsed flag.  */
 		    }
diff --git a/gas/config/tc-arc.h b/gas/config/tc-arc.h
index 16f6a0686f..b61342bc11 100644
--- a/gas/config/tc-arc.h
+++ b/gas/config/tc-arc.h
@@ -225,7 +225,7 @@ struct arc_flags
   char name[MAX_FLAG_NAME_LENGTH + 1];
 
   /* Pointer to arc flags.  */
-  struct arc_flag_operand *flgp;
+  const struct arc_flag_operand *flgp;
 };
 
 extern const relax_typeS md_relax_table[];