diff --git a/include/ChangeLog b/include/ChangeLog
index e5a80b96b799767b60ac02f5e4acbaae2c382893..ea82b8680f40f0a3850b23c377fbcd05e29f4079 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-29  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* opcode/sparc.h (enum sparc_opcode_arch_val): Move
+	SPARC_OPCODE_ARCH_MAX into the enum.
+
 2016-06-28  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* opcode/aarch64.h (aarch64_opnd_info): Change index fields to int64_t.
diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h
index 57225b6325e9c8990781a9c07dac8381577c8c6f..7e44408789ab3db4c982bb81820c4bbdbf6aab05 100644
--- a/include/opcode/sparc.h
+++ b/include/opcode/sparc.h
@@ -58,11 +58,10 @@ enum sparc_opcode_arch_val
   SPARC_OPCODE_ARCH_V9V, /* V9 with OSA2011 and T4 additions, integer
                             multiply and Fujitsu fp multiply-add.  */
   SPARC_OPCODE_ARCH_V9M, /* V9 with OSA2015 and M7 additions.  */
+  SPARC_OPCODE_ARCH_MAX = SPARC_OPCODE_ARCH_V9M,
   SPARC_OPCODE_ARCH_BAD  /* Error return from sparc_opcode_lookup_arch.  */
 };
 
-/* The highest architecture in the table.  */
-#define SPARC_OPCODE_ARCH_MAX (SPARC_OPCODE_ARCH_BAD - 1)
 
 /* Given an enum sparc_opcode_arch_val, return the bitmask to use in
    insn encoding/decoding.  */