diff --git a/ChangeLog b/ChangeLog
index 716f69c70..f4f8757aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end
+	occurencies with END.
+
 2013-11-13  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-editenv.c (help_filter, argp): Document how to delete
diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
index a76076973..9f8265315 100644
--- a/grub-core/kern/arm/efi/startup.S
+++ b/grub-core/kern/arm/efi/startup.S
@@ -33,4 +33,4 @@ FUNCTION(_start)
 	str	r1, [ip]
 	ldr	ip, =EXT_C(grub_main)
 	bx	ip
-	.end
+	END
diff --git a/grub-core/kern/arm/misc.S b/grub-core/kern/arm/misc.S
index 68e4828fd..94522c222 100644
--- a/grub-core/kern/arm/misc.S
+++ b/grub-core/kern/arm/misc.S
@@ -58,4 +58,4 @@ FUNCTION(raise)
 	mov	r0, #0
 	bx	lr
 	
-	.end
+	END
diff --git a/grub-core/kern/arm/uboot/startup.S b/grub-core/kern/arm/uboot/startup.S
index 3473dacc9..66c3ea423 100644
--- a/grub-core/kern/arm/uboot/startup.S
+++ b/grub-core/kern/arm/uboot/startup.S
@@ -166,4 +166,4 @@ transition_space:
 VARIABLE(grub_uboot_syscall_ptr)
 	.long	0	@
 
-	.end
+	END
diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index 8f54dd8b9..62d3cb1d1 100644
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -37,6 +37,14 @@
 # define EXT_C(sym)	sym
 #endif
 
+#ifdef __arm__
+#ifdef __clang__
+#define END
+#else
+#define END .end
+#endif
+#endif
+
 #if defined (__APPLE__)
 #define FUNCTION(x)	.globl EXT_C(x) ; EXT_C(x):
 #define VARIABLE(x)	.globl EXT_C(x) ; EXT_C(x):