diff --git a/ChangeLog b/ChangeLog
index 2f6140cf6..42731f118 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-13  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
+
+	* include/grub/symbol.h: (FUNCTION): Use double quotes instead of
+	"@" which marks the start of a comment on ARM.
+	(VARIABLE): Likewise.
+
 2005-11-13  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
 
         Add support for Linux/ADFS partition tables.
diff --git a/include/grub/symbol.h b/include/grub/symbol.h
index 8c392e86e..d8e5f1ccf 100644
--- a/include/grub/symbol.h
+++ b/include/grub/symbol.h
@@ -29,8 +29,8 @@
 # define EXT_C(sym)	sym
 #endif
 
-#define FUNCTION(x)	.globl EXT_C(x) ; .type EXT_C(x), @function ; EXT_C(x):
-#define VARIABLE(x)	.globl EXT_C(x) ; .type EXT_C(x), @object ; EXT_C(x):
+#define FUNCTION(x)	.globl EXT_C(x) ; .type EXT_C(x), "function" ; EXT_C(x):
+#define VARIABLE(x)	.globl EXT_C(x) ; .type EXT_C(x), "object" ; EXT_C(x):
 
 /* Mark an exported symbol.  */
 #define EXPORT_FUNC(x)	x