diff --git a/ChangeLog b/ChangeLog
index 1a6637f29..f925bfd1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-16  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/boot.c (load_image): When handling Linux cmdline, don't
+	copy a null character from SRC to DEST, because this inserted an
+	extra null character into the cmdline. Reported by Robert
+	Bihlmeyer <robbe@orcus.priv.at>.
+	
 2000-10-16  OKUJI Yoshinori  <okuji@gnu.org>
 
 	Some of the new Multiboot features are supported. APM support
diff --git a/stage2/boot.c b/stage2/boot.c
index 6269e1e66..cb3e72681 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -320,8 +320,9 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
 	    char *src = skip_to (0, arg);
 	    char *dest = (char *) CL_MY_LOCATION;
 
-	    while (((int) dest) < CL_MY_END_ADDR && (*(dest++) = *(src++)));
-
+	    while (((int) dest) < CL_MY_END_ADDR && *src)
+	      *(dest++) = *(src++);
+	    
 	    /* Add a mem option automatically only if the user doesn't
 	       specify it explicitly.  */
 	    if (! grub_strstr (arg, "mem=")