diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l
index af61a67..08a70e0 100644
--- a/lib/AsmParser/Lexer.l
+++ b/lib/AsmParser/Lexer.l
@@ -210,7 +210,7 @@
 deplibs         { return DEPLIBS; }
 endian          { return ENDIAN; }
 pointersize     { return POINTERSIZE; }
-data          { return DATA; }
+datalayout      { return DATALAYOUT; }
 little          { return LITTLE; }
 big             { return BIG; }
 volatile        { return VOLATILE; }
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index 25c8c2f..10270eb 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1068,7 +1068,7 @@
 %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
 %token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
 %token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
-%token DATA
+%token DATALAYOUT
 %type <UIntVal> OptCallingConv
 
 // Basic Block Terminating Operators
@@ -1874,7 +1874,7 @@
     free($3);
     CHECK_FOR_ERROR
   };
-  | DATA '=' STRINGCONSTANT {
+  | DATALAYOUT '=' STRINGCONSTANT {
     CurModule.CurrentModule->setDataLayout($3);
     free($3);
     CHECK_FOR_ERROR