diff --git a/ld/ChangeLog b/ld/ChangeLog
index 94f56b15b1..54c2755d7f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-20  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* emultempl/armelf.em (OPTION_STUBGROUP_SIZE): Fix formatting.
+	(OPTION_NO_MERGE_EXIDX_ENTRIES, OPTION_LONG_PLT): Likewise.
+
 2014-08-20  Will Newton  <will.newton@linaro.org>
 
 	* configure.tgt: Default armeb-*-eabi* to big endian.
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 371b440cec..1dde019706 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -531,14 +531,14 @@ PARSE_AND_LIST_PROLOGUE='
 #define OPTION_NO_ENUM_SIZE_WARNING	309
 #define OPTION_PIC_VENEER		310
 #define OPTION_FIX_V4BX_INTERWORKING	311
-#define OPTION_STUBGROUP_SIZE           312
+#define OPTION_STUBGROUP_SIZE		312
 #define OPTION_NO_WCHAR_SIZE_WARNING	313
 #define OPTION_FIX_CORTEX_A8		314
 #define OPTION_NO_FIX_CORTEX_A8		315
-#define OPTION_NO_MERGE_EXIDX_ENTRIES   316
+#define OPTION_NO_MERGE_EXIDX_ENTRIES	316
 #define OPTION_FIX_ARM1176		317
 #define OPTION_NO_FIX_ARM1176		318
-#define OPTION_LONG_PLT		        319
+#define OPTION_LONG_PLT			319
 '
 
 PARSE_AND_LIST_SHORTOPTS=p