diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 466ed3f..6e46638 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Aug 20 12:46:37 CEST 2008 - mkoenig@suse.de
+
+- add uuid related manpages to uuid-runtime subpackage [bnc#418568]
+
+-------------------------------------------------------------------
+Mon Aug 18 14:49:25 CEST 2008 - mkoenig@suse.de
+
+- currently do not install *.ext4 links for mkfs and fsck
+  tools, but only the *.ext4dev links. 
+
 -------------------------------------------------------------------
 Wed Jul 16 14:41:45 CEST 2008 - mkoenig@suse.de
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index fb04f4f..5a4ab3f 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -2,9 +2,16 @@
 # spec file for package e2fsprogs (Version 1.41.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -20,7 +27,7 @@ Supplements:    filesystem(ext2) filesystem(ext3)
 PreReq:         %install_info_prereq
 AutoReqProv:    on
 Version:        1.41.0
-Release:        1
+Release:        16
 Summary:        Utilities for the Second Extended File System
 Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -274,6 +281,13 @@ ln -sf ../../etc/init.d/uuidd $RPM_BUILD_ROOT/usr/sbin/rcuuidd
 # fillup template
 mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates
 install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/
+# currently don't install links for ext4 tools and only the ext4dev ones
+# as long as ext4 is not marked stable and the kernel module renamed
+# from ext4dev to ext4
+rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4
+rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4
+rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4.8
+rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4.8
 
 %check
 make check
@@ -345,12 +359,12 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/fsck
 /sbin/fsck.ext2
 /sbin/fsck.ext3
-/sbin/fsck.ext4
+#/sbin/fsck.ext4
 /sbin/fsck.ext4dev
 /sbin/mke2fs
 /sbin/mkfs.ext2
 /sbin/mkfs.ext3
-/sbin/mkfs.ext4
+#/sbin/mkfs.ext4
 /sbin/mkfs.ext4dev
 /sbin/resize2fs
 /sbin/tune2fs
@@ -365,10 +379,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/libext2fs.info.gz
 %{_mandir}/man1/chattr.1.gz
 %{_mandir}/man1/lsattr.1.gz
-%{_mandir}/man1/uuidgen.1.gz
 %{_mandir}/man5/e2fsck.conf.5.gz
 %{_mandir}/man5/mke2fs.conf.5.gz
 %{_mandir}/man8/*.8.gz
+%exclude %{_mandir}/man8/uuidd.8.gz
 
 %files devel
 %defattr(-,root,root)
@@ -395,6 +409,8 @@ rm -rf $RPM_BUILD_ROOT
 /etc/init.d/uuidd
 /usr/sbin/rcuuidd
 /var/adm/fillup-templates/sysconfig.uuidd
+%{_mandir}/man1/uuidgen.1.gz
+%{_mandir}/man8/uuidd.8.gz
 
 %files -n libuuid1
 %defattr(-, root, root)
@@ -448,6 +464,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/com_err.3.gz
 
 %changelog
+* Wed Aug 20 2008 mkoenig@suse.de
+- add uuid related manpages to uuid-runtime subpackage [bnc#418568]
+* Mon Aug 18 2008 mkoenig@suse.de
+- currently do not install *.ext4 links for mkfs and fsck
+  tools, but only the *.ext4dev links.
 * Wed Jul 16 2008 mkoenig@suse.de
 - update to version 1.41.0
   * add support for ext4 filesystem features: