diff --git a/ChangeLog b/ChangeLog
index 68699faad..a7c3a4a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-08  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* stage2/fsys_xfs.c (next_dentry): Use arrays of arrays instead of
+	arrays of pointers for USUAL, to avoid read-only strings. Reported
+	by Sven Wegener <swegener@gentoo.org>.
+
 2005-03-28  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* lib/device.c (get_drive_geometry): Use ST.ST_SIZE instead of
diff --git a/THANKS b/THANKS
index 6e1d14506..853da1a5e 100644
--- a/THANKS
+++ b/THANKS
@@ -105,6 +105,7 @@ Serguei Tzukanov <tzukanov@narod.ru>
 Stefan Ondrejicka <ondrej@idata.sk>
 Stephen Early <steve@greenend.org.uk>
 Steven Dick <ssd.gnu@mmae.ucf.edu>
+Sven Wegener <swegener@gentoo.org>
 Takehiro Suzuki <takehiro@coral.ocn.ne.jp>
 Taketo Kabe <kabe@sra-tohoku.co.jp>
 Thierry DELHAISE <thierry.delhaise@delhaise.com>
diff --git a/docs/grub.8 b/docs/grub.8
index 577b44a45..4881905be 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "March 2005" "grub (GNU GRUB 0.96)" FSF
+.TH GRUB "8" "May 2005" "grub (GNU GRUB 0.96)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 16b1a36a6..6e41c17ef 100644
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH MBCHK "1" "March 2005" "mbchk (GNU GRUB 0.96)" FSF
+.TH MBCHK "1" "May 2005" "mbchk (GNU GRUB 0.96)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS
diff --git a/stage2/fsys_xfs.c b/stage2/fsys_xfs.c
index 8ee31aecc..76c4c13b5 100644
--- a/stage2/fsys_xfs.c
+++ b/stage2/fsys_xfs.c
@@ -334,7 +334,7 @@ next_dentry (xfs_ino_t *ino)
 {
 	int namelen = 1;
 	int toread;
-	static char *usual[2] = {".", ".."};
+	static char usual[2][3] = {".", ".."};
 	static xfs_dir2_sf_entry_t *sfe;
 	char *name = usual[0];