diff --git a/ChangeLog b/ChangeLog
index 9ff55aa03..92b382e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2000-12-14  OKUJI Yoshinori  <okuji@gnu.org>
+
+	From HORIKAWA Kazunori <kaz-hori@tkd.att.ne.jp>:
+	* stage2/bios.c (get_diskinfo): Append 16 bytes dummy data to
+	DRP, because the BIOS of Thinkpad X20 write a garbage beyond the
+	size of the structure.
+	
 2000-12-09  Jochen Hoenicke  <jochen@gnu.org>
 
-	* stage2/disk_io.c (next_partition):  Mask out bsd partition sub
+	* stage2/disk_io.c (next_partition): Mask out bsd partition sub
 	type when checking if last partition was a bsd partition.
 	Reported by Heikki Vatiainen <hessu@cs.tut.fi>.
 	
diff --git a/THANKS b/THANKS
index eca1f9a16..959ce2c9a 100644
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ Hal Snyder <hal@vailsys.com>
 Heiko Schroeder <heiko@pool.informatik.rwth-aachen.de>
 Herbert Nachtnebel <nachtneb@iaee.tuwien.ac.at>
 Hisazumi Kenji <nel@soraneko.com>
+HORIKAWA Kazunori <kaz-hori@tkd.att.ne.jp>
 Jan Fricke <fricke@uni-greifswald.de>
 Jochen Hoenicke <jochen@gnu.org>
 Johannes Kroeger <hanne@squirrel.owl.de>
diff --git a/docs/grub-install.8 b/docs/grub-install.8
index c28cee1f3..334413caf 100644
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "November 2000" "grub-install (GNU GRUB 0.5.97)" FSF
+.TH GRUB-INSTALL "8" "December 2000" "grub-install (GNU GRUB 0.5.97)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index 9f58bb671..721e17334 100644
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "November 2000" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "December 2000" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS
diff --git a/docs/grub.8 b/docs/grub.8
index 4e4fb9714..2640ab114 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" "November 2000" "grub (GNU GRUB 0.5.97)" FSF
+.TH GRUB "8" "December 2000" "grub (GNU GRUB 0.5.97)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 60b3093d9..c5fa68562 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" "November 2000" "mbchk (GNU GRUB 0.5.97)" FSF
+.TH MBCHK "1" "December 2000" "mbchk (GNU GRUB 0.5.97)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS
diff --git a/stage2/bios.c b/stage2/bios.c
index c374d65bb..40d041e8e 100644
--- a/stage2/bios.c
+++ b/stage2/bios.c
@@ -157,7 +157,12 @@ get_diskinfo (int drive, struct geometry *geometry)
 	    unsigned char device_path[8];
 	    unsigned char reserved2;
 	    unsigned char checksum;
-	  } drp;
+
+	    /* XXX: This is necessary, because the BIOS of Thinkpad X20
+	       writes a garbage to the tail of drive parameters,
+	       regardless of a size specified in a caller.  */
+	    unsigned char dummy[16];
+	  } __attribute__ ((packed)) drp;
 	  
 	  drp.size = sizeof (drp);
 	  err = get_diskinfo_int13_extensions (drive, &drp);