diff --git a/baselibs.conf b/baselibs.conf
index 4ce6559..5d89a17 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,9 +1,13 @@
 libuuid1
 libuuid-devel
+	requires -libuuid-<targettype>
+	requires "libuuid1-<targettype> = <version>"
 	requires -libblkid-<targettype>
 	requires "libblkid1-<targettype> = <version>"
 libblkid1
 	obsoletes "e2fsprogs-<targettype> <= <version>"
 libblkid-devel
+	requires -libblkid-<targettype>
+	requires "libblkid1-<targettype> = <version>"
 	requires -libuuid-<targettype>
 	requires "libuuid1-<targettype> = <version>"
diff --git a/util-linux-ng-bnc503008.patch b/util-linux-ng-bnc503008.patch
new file mode 100644
index 0000000..1482097
--- /dev/null
+++ b/util-linux-ng-bnc503008.patch
@@ -0,0 +1,24 @@
+commit fdf08588af55d07a99b411708a08f4ebe6819706
+Author: Theodore Ts'o <tytso@mit.edu>
+Date:   Sat Oct 3 12:50:06 2009 -0400
+
+    lib: fix file descriptor leak in is_mounted()
+    
+    Remove an extraneous fopen() that leaks memory and a file descriptor.
+    
+    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+
+diff --git a/lib/ismounted.c b/lib/ismounted.c
+index 28ae325..fbe91f9 100644
+--- a/lib/ismounted.c
++++ b/lib/ismounted.c
+@@ -70,9 +70,6 @@ static int check_mntent_file(const char *mtab_file, const char *file,
+ 	char		buf[1024], *device = 0, *mnt_dir = 0, *cp;
+ 
+ 	*mount_flags = 0;
+-	if ((f = fopen(mtab_file, "r")) == NULL)
+-		return errno;
+-
+ 	if ((f = setmntent (mtab_file, "r")) == NULL)
+ 		return errno;
+ 	if (stat(file, &st_buf) == 0) {
diff --git a/util-linux.changes b/util-linux.changes
index 42af8cc..cb4f923 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org
+
+- fsck during boot up fails with Too many open files [bnc#503008] 
+
+-------------------------------------------------------------------
+Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de
+
+- fix typo in baselibs.conf change
+
+-------------------------------------------------------------------
+Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de
+
+- Fix requires of 32-bit devel packages.
+
 -------------------------------------------------------------------
 Tue Sep 29 12:58:37 UTC 2009 - hvogel@novell.com
 
diff --git a/util-linux.spec b/util-linux.spec
index 31177ab..9777302 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -29,7 +29,7 @@ License:        BSD 3-clause (or similar) ; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
 Version:        2.16
-Release:        3
+Release:        4
 Requires:       %name-lang = %{version}
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
@@ -68,6 +68,7 @@ Patch1:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 Patch2:         util-linux-2.14.1-mount_skip_sync.patch
 # crypto patch
 Patch3:         util-linux-mount_losetup_crypto.patch
+Patch4:		    util-linux-ng-bnc503008.patch	
 ##
 ## adjtimex
 ##
@@ -152,6 +153,7 @@ unique IDs (UUIDs).
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 #
 cd adjtimex-*
 %patch50 -p1