diff --git a/util-linux-2.18-no-canonicalize-fix.patch b/util-linux-2.18-no-canonicalize-fix.patch
new file mode 100644
index 0000000..774025f
--- /dev/null
+++ b/util-linux-2.18-no-canonicalize-fix.patch
@@ -0,0 +1,24 @@
+commit 1cf4c20b198c0c6566198fd00b983d9aaf8321bc
+Author: Miklos Szeredi <miklos@szeredi.hu>
+Date:   Thu Oct 7 16:05:12 2010 +0200
+
+    mount: don't canonicalize "spec" with --no-canonicalize option
+    
+    "Spec" was still canonicalized despite --no-canonicalize.  This
+    resulted in a hang during login with pam_encfs (Debian Bug#593336).
+    
+    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
+
+diff --git a/mount/devname.c b/mount/devname.c
+index 585d259..05da092 100644
+--- a/mount/devname.c
++++ b/mount/devname.c
+@@ -8,7 +8,7 @@ spec_to_devname(const char *spec)
+ {
+ 	if (!spec)
+ 		return NULL;
+-	if (is_pseudo_fs(spec))
++	if (nocanonicalize || is_pseudo_fs(spec))
+ 		return xstrdup(spec);
+ 	return fsprobe_get_devname_by_spec(spec);
+ }
diff --git a/util-linux.changes b/util-linux.changes
index a5ef0a3..bf031ad 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Dec  2 17:09:08 CET 2010 - mszeredi@suse.cz
+
+- mount: don't canonicalize "spec" with --no-canonicalize option
+  [bnc#651598]
+
+-------------------------------------------------------------------
+Thu Dec  2 15:23:36 CET 2010 - mszeredi@suse.cz
+
+- add Provides: util-linux(fake+no-canonicalize) [bnc#651598]
+
 -------------------------------------------------------------------
 Tue Nov 30 12:19:53 UTC 2010 - puzel@novell.com
 
diff --git a/util-linux.spec b/util-linux.spec
index cfe4502..1ec25de 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -33,12 +33,14 @@ BuildRequires:  zlib-devel
 Url:            http://userweb.kernel.org/~kzak/util-linux-ng/
 Supplements:    filesystem(minix)
 Provides:       fsck-with-dev-lock = %{version}
+# bnc#651598:
+Provides:       util-linux(fake+no-canonicalize)
 PreReq:         %install_info_prereq permissions
 License:        GPLv2+
 Group:          System/Base
 AutoReqProv:    on
 Version:        2.18
-Release:        5
+Release:        6
 Recommends:     %name-lang = %{version}
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
@@ -82,6 +84,7 @@ Patch4:         util-linux-2.17.1-losetup-honor-documented-c-option
 Patch7:         util-linux-swapon-btrfs-limitations
 Patch8:         util-linux-agetty-s-option.patch
 Patch9:         util-linux-fsck-l-option.patch
+Patch10:        util-linux-2.18-no-canonicalize-fix.patch
 ##
 ## adjtimex
 ##
@@ -190,6 +193,7 @@ Files to develop applications using the libmount library.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 #
 cd adjtimex-*
 # adjtimex patches belongs here