diff --git a/ld/ChangeLog b/ld/ChangeLog
index 8a062e1f97..3aa46ed88e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-04  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* emultempl/mipself.em (PARSE_AND_LIST_PROLOGUE): Convert
+	OPTION_INSN32 and OPTION_NO_INSN32 macros to an enum.
+
 2016-01-04  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* testsuite/ld-mips-elf/attr-gnu-4-14.d: Update the order of
diff --git a/ld/emultempl/mipself.em b/ld/emultempl/mipself.em
index 1b79aaf223..dbff36bb8d 100644
--- a/ld/emultempl/mipself.em
+++ b/ld/emultempl/mipself.em
@@ -250,8 +250,11 @@ EOF
 # parse_args and list_options functions.
 #
 PARSE_AND_LIST_PROLOGUE='
-#define OPTION_INSN32			301
-#define OPTION_NO_INSN32		(OPTION_INSN32 + 1)
+enum
+  {
+    OPTION_INSN32 = 301,
+    OPTION_NO_INSN32
+  };
 '
 
 PARSE_AND_LIST_LONGOPTS='