diff --git a/ChangeLog b/ChangeLog
index b2da87e00..3d70da567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-05-13  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* util/grub-install.in: If the program `cp' fails, exit with the
+	status code 1. Suggested by Pavel Roskin.
+	
+2000-05-13  OKUJI Yoshinori  <okuji@gnu.org>
+
+	From Pixel <pixel@mandrakesoft.com>:
+	* stage2/pc_slice.h (PC_SLICE_TYPE_LINUX_EXTENDED): New macro.
+	(IS_PC_SLICE_TYPE_EXTENDED): Added a check for
+	PC_SLICE_TYPE_LINUX_EXTENDED.
+	
 2000-05-05  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* stage2/common.c (init_bios_info) [!STAGE1_5]: When the memory
diff --git a/stage2/pc_slice.h b/stage2/pc_slice.h
index c96614d15..cf860b185 100644
--- a/stage2/pc_slice.h
+++ b/stage2/pc_slice.h
@@ -111,6 +111,7 @@
 #define PC_SLICE_TYPE_WIN95_EXTENDED	0xf
 #define PC_SLICE_TYPE_MINIX		0x80
 #define PC_SLICE_TYPE_EXT2FS       	0x83
+#define PC_SLICE_TYPE_LINUX_EXTENDED	0x85
 
 /* For convinience.  */
 /* Check if TYPE is a FAT partition type. Clear the hidden flag before
@@ -126,7 +127,8 @@
 
 #define IS_PC_SLICE_TYPE_EXTENDED(type)	\
   (((type) == PC_SLICE_TYPE_EXTENDED)	\
-   || ((type) == PC_SLICE_TYPE_WIN95_EXTENDED))
+   || ((type) == PC_SLICE_TYPE_WIN95_EXTENDED)	\
+   || ((type) == PC_SLICE_TYPE_LINUX_EXTENDED))
 
 /* these ones are special, as they use their own partitioning scheme
    to subdivide the PC partitions from there.  */
diff --git a/util/grub-install.in b/util/grub-install.in
index 9c0982093..e10cb9bc1 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -249,7 +249,8 @@ fi
 
 # Copy the GRUB images to the GRUB directory.
 rm -f ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5
-cp ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5 ${grubdir}
+cp ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5 \
+    ${grubdir} || exit 1
 
 # Create a safe temporary file.
 test -x /bin/tempfile && log_file=`tempfile --prefix=grub`