diff --git a/coreutils-6.8.tar.bz2 b/coreutils-6.8.tar.bz2
deleted file mode 100644
index c618fa5..0000000
--- a/coreutils-6.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e06a88323ddb1f47593c5c71b921f0703bc0e2d3beb47a11a94d6c96245e208a
-size 5338168
diff --git a/coreutils-6.8.diff b/coreutils-6.9.diff
similarity index 75%
rename from coreutils-6.8.diff
rename to coreutils-6.9.diff
index 8a91e94..977ff3d 100644
--- a/coreutils-6.8.diff
+++ b/coreutils-6.9.diff
@@ -1,6 +1,6 @@
 Index: doc/coreutils.texi
-===================================================================
---- doc/coreutils.texi.orig
+================================================================================
+--- doc/coreutils.texi
 +++ doc/coreutils.texi
 @@ -64,8 +64,6 @@
  * fold: (coreutils)fold invocation.             Wrap long input lines.
@@ -11,7 +11,7 @@ Index: doc/coreutils.texi
  * id: (coreutils)id invocation.                 Print user identity.
  * install: (coreutils)install invocation.       Copy and change attributes.
  * join: (coreutils)join invocation.             Join lines on a common field.
-@@ -399,8 +397,6 @@ System context
+@@ -399,8 +397,6 @@
  
  * date invocation::              Print or set system date and time
  * uname invocation::             Print system information
@@ -20,7 +20,7 @@ Index: doc/coreutils.texi
  
  @command{date}: Print or set system date and time
  
-@@ -12299,8 +12295,6 @@ information.
+@@ -12306,8 +12302,6 @@
  @menu
  * date invocation::             Print or set system date and time.
  * uname invocation::            Print system information.
@@ -29,7 +29,7 @@ Index: doc/coreutils.texi
  @end menu
  
  
-@@ -13058,55 +13052,6 @@ Print the kernel version.
+@@ -13065,55 +13059,6 @@
  @exitstatus
  
  
@@ -85,25 +85,9 @@ Index: doc/coreutils.texi
  @node Modified command invocation
  @chapter Modified command invocation
  
-Index: src/install.c
-===================================================================
---- src/install.c.orig
-+++ src/install.c
-@@ -571,7 +571,8 @@ strip (char const *name)
-       while (pid != wait (&status))	/* Wait for kid to finish. */
- 	/* Do nothing. */ ;
-       if (status)
--	error (EXIT_FAILURE, 0, _("strip failed"));
-+	/* Don't fail just because `strip' failed.  */
-+	error (0, 0, _("strip failed"));
-       break;
-     }
- }
-Index: src/system.h
-===================================================================
---- src/system.h.orig
+--- src/system.h
 +++ src/system.h
-@@ -168,7 +168,7 @@ enum
+@@ -168,7 +168,7 @@
  # define DEV_BSIZE BBSIZE
  #endif
  #ifndef DEV_BSIZE
@@ -112,11 +96,9 @@ Index: src/system.h
  #endif
  
  /* Extract or fake data from a `struct stat'.
-Index: tests/help-version
-===================================================================
---- tests/help-version.orig
+--- tests/help-version
 +++ tests/help-version
-@@ -197,7 +197,7 @@ lbracket_args=": ]"
+@@ -197,7 +197,7 @@
  
  for i in $all_programs; do
    # Skip these.
@@ -125,11 +107,9 @@ Index: tests/help-version
  
    rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
    echo > $tmp_in
-Index: tests/other-fs-tmpdir
-===================================================================
---- tests/other-fs-tmpdir.orig
+--- tests/other-fs-tmpdir
 +++ tests/other-fs-tmpdir
-@@ -44,6 +44,8 @@ for d in $CANDIDATE_TMP_DIRS; do
+@@ -44,6 +44,8 @@
    fi
  
  done
diff --git a/coreutils-6.9.tar.bz2 b/coreutils-6.9.tar.bz2
new file mode 100644
index 0000000..5c0f9c5
--- /dev/null
+++ b/coreutils-6.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
+size 5384378
diff --git a/coreutils.changes b/coreutils.changes
index b379a21..981f203 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Mar 23 17:03:38 CET 2007 - schwab@suse.de
+
+- Update to coreutils 6.9.
+  ** Bug fixes
+    cp -x (--one-file-system) would fail to set mount point permissions
+    The default block size and output format for df -P are now unaffected by
+    the DF_BLOCK_SIZE, BLOCK_SIZE, and BLOCKSIZE environment variables.  It
+    is still affected by POSIXLY_CORRECT, though.
+    Using pr -m -s (i.e. merging files, with TAB as the output separator)
+    no longer inserts extraneous spaces between output columns.
+
 -------------------------------------------------------------------
 Wed Mar 14 15:50:36 CET 2007 - lnussel@suse.de
 
diff --git a/coreutils.spec b/coreutils.spec
index bb6928a..bd8d10f 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package coreutils (Version 6.8)
+# spec file for package coreutils (Version 6.9)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@ Obsoletes:      fileutil fileutils sh-utils sh_utils stat textutil textutils
 Obsoletes:      libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = 9 libselinux-x86 = 9
 Autoreqprov:    on
 PreReq:         %{install_info_prereq}
-Version:        6.8
-Release:        6
+Version:        6.9
+Release:        1
 Summary:        GNU Core Utilities
 Source:         coreutils-%{version}.tar.bz2
 Source1:        su.pamd
@@ -171,6 +171,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/share/locale/*/LC_TIME
 
 %changelog
+* Fri Mar 23 2007 - schwab@suse.de
+- Update to coreutils 6.9.
+  ** Bug fixes
+  cp -x (--one-file-system) would fail to set mount point permissions
+  The default block size and output format for df -P are now unaffected by
+  the DF_BLOCK_SIZE, BLOCK_SIZE, and BLOCKSIZE environment variables.  It
+  is still affected by POSIXLY_CORRECT, though.
+  Using pr -m -s (i.e. merging files, with TAB as the output separator)
+  no longer inserts extraneous spaces between output columns.
 * Wed Mar 14 2007 - lnussel@suse.de
 - su: actually use /etc/pam.d/su-l when running su - (#254428)
 * Mon Mar 05 2007 - lnussel@suse.de