--- ChangeLog
+++ ChangeLog
@@ -1 +1,6 @@
+2004-03-28  Pavel Roskin  <address@hidden>
+
+	* stage2/boot.c: Imply --no-mem-option for Linux kernels with
+	protocol version 0x0203 and above (Linux 2.4.18 and newer).
+
 2004-03-27  Yoshinori K. Okuji  <address@hidden>
--- NEWS
+++ NEWS
@@ -6,6 +6,7 @@
 * Support ATARAID for Linux in the grub shell and grub-install.
 * Add CDROM support for El Torito with no emulation mode. You can use
   (cd) as a CDROM drive in the config file.
+* Option --no-mem-option is implied for Linux 2.4.18 and newer.
 
 New in 0.94 - 2004-01-25:
 * Support building on x86-64 with gcc -m32.
--- docs/grub.texi
+++ docs/grub.texi
@@ -2735,7 +2735,7 @@
 
 The option @option{--no-mem-option} is effective only for Linux. If the
 option is specified, GRUB doesn't pass the option @option{mem=} to the
-kernel.
+kernel.  This option is implied for Linux kernels 2.4.18 and newer.
 @end deffn
 
 
--- stage2/boot.c
+++ stage2/boot.c
@@ -408,9 +408,10 @@ load_image (char *kernel, char *arg, ker
 	      *(dest++) = *(src++);
 	
 	    /* Add a mem option automatically only if the user doesn't
-	       specify it explicitly.  */
+	       specify it explicitly (old kernels only).  */
 	    if (! grub_strstr (arg, "mem=")
 		&& ! (load_flags & KERNEL_LOAD_NO_MEM_OPTION)
+		&& lh->version < 0x0203		/* kernel version < 2.4.18 */
 		&& dest + 15 < linux_data_tmp_addr + LINUX_CL_END_OFFSET)
 	      {
 		*dest++ = ' ';