diff --git a/ChangeLog b/ChangeLog
index ca2412b51..0682407b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-30  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage1/stage1.S (message): Use lodsb instead of incw and movb.
+	From Andrew Clausen <clausen@gnu.org>.
+
+	* stage1/stage1.S (copy_buffer): Set %cx to 0x100 and use movsw
+	instead of movsb, since it is guaranteed that the region is
+	properly aligned.
+	
 2000-04-29  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* stage2/builtins.c (setup_func): Use SECTOR_BITS instead of
diff --git a/THANKS b/THANKS
index 088dadb85..f3fa3634c 100644
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ time and energy in helping to track down bugs, add new features, and
 generally assist in the GRUB maintainership process:
 
 Alexander K. Hudek <alexhudek@home.com>
+Andrew Clausen <clausen@gnu.org>
 Bradford Hovinen <hovinen@redrose.net>
 Brian Brunswick <brian@skarpsey.demon.co.uk>
 Bryan Ford <baford@cs.utah.edu>
diff --git a/stage1/stage1.S b/stage1/stage1.S
index 1595f3196..64b59a3af 100644
--- a/stage1/stage1.S
+++ b/stage1/stage1.S
@@ -348,7 +348,7 @@ copy_buffer:
 	pushw	%ds
 	pushw	%si
 	
-	movw	$0x200, %cx
+	movw	$0x100, %cx
 	movw	%bx, %ds
 	xorw	%si, %si
 	xorw	%di, %di
@@ -356,7 +356,7 @@ copy_buffer:
 	cld
 	
 	rep
-	movsb
+	movsw
 
 	popw	%si
 	popw	%ds
@@ -414,10 +414,8 @@ general_error_string:	.string " Error"
 	movw	$0x0001, %bx
 	movb	$0xe, %ah
 	int	$0x10		/* display a byte */
-
-	incw	%si
 message:
-	movb	(%si), %al
+	lodsb
 	cmpb	$0, %al
 	jne	1b	/* if not end of string, jmp to display */
 	ret