diff --git a/gas/ChangeLog b/gas/ChangeLog
index eca2c129f44..0ecfb485fdd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* config/tc-mmix.c (mmix_parse_predefined_name): Change type of
+	handler_charp to const char *.
+
 2016-05-24  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
 	* config/tc-ft32.h (DEFAULT_TARGET_FORMAT): Remove.
diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index 24362ad70c8..9cf94c51383 100644
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -3813,7 +3813,7 @@ int
 mmix_parse_predefined_name (char *name, expressionS *expP)
 {
   char *canon_name;
-  char *handler_charp;
+  const char *handler_charp;
   const char handler_chars[] = "DVWIOUZX";
   symbolS *symp;