diff --git a/ChangeLog b/ChangeLog
index df7f90587..8d117a5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* acinclude.m4: Remove `nop' assembly instruction; it's not
+	implemented by all architectures.
+
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
+	ELILO.  This is no longer necessary.
+
+2010-01-18  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Added new tool, grub-scrit-check to verify grub.cfg syntax.
+
+	* util/grub-script-check.c: grub-script-check tool.
+	* conf/common.rmk: Make rules for grub-script-check.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Fix annoying UI bug in rescue mode.  Thanks to Tristan Gingold for
diff --git a/acinclude.m4 b/acinclude.m4
index 6f9baf18f..36a3b3e08 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,7 +18,7 @@ AC_DEFUN(grub_PROG_TARGET_CC,
 [AC_MSG_CHECKING([whether target compiler is working])
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start: nop");
+asm (".globl start; start:");
 int main (void);
 ]], [[]])],
   		[grub_cv_prog_target_cc=yes],
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 2e26f3929..053c3ed22 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -676,8 +676,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  /* XXX Linux assumes that only elilo can boot Linux on EFI!!!  */
-  params->type_of_loader = (LINUX_LOADER_ID_ELILO << 4);
+  params->type_of_loader = (LINUX_LOADER_ID_GRUB << 4);
 
   params->cl_magic = GRUB_LINUX_CL_MAGIC;
   params->cl_offset = 0x1000;