diff --git a/cifs-utils.changes b/cifs-utils.changes
index 76e6672..0228deb 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 12 11:54:14 UTC 2012 - lmuelle@suse.com
+
+- mount.cifs: set rc to 0 in libcap toggle_dac_capability
+
 -------------------------------------------------------------------
 Fri Jun  1 18:30:07 UTC 2012 - lmuelle@suse.com
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index f35d51c..d5b62ca 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -27,6 +27,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
+Patch:          set-rc-libcap-toggle_dac_capability.diff
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else
@@ -73,6 +74,7 @@ the Linux CIFS filesystem.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"
diff --git a/set-rc-libcap-toggle_dac_capability.diff b/set-rc-libcap-toggle_dac_capability.diff
new file mode 100644
index 0000000..d0fc6d6
--- /dev/null
+++ b/set-rc-libcap-toggle_dac_capability.diff
@@ -0,0 +1,38 @@
+From: Jeff Layton <jlayton@samba.org>
+To: linux-cifs@vger.kernel.org
+Cc: roderburg@uni-koeln.de
+Date: Tue, 12 Jun 2012 06:12:30 -0400
+Subject: [PATCH] mount.cifs: set rc to 0 in libcap toggle_dac_capability
+
+Thus spake Jochen:
+
+The mount.cifs program from the cifs-utils package 5.5 did not work on
+my Linux system. It just exited without an error message and did not
+mount anything.
+
+[...]
+
+I think, when this variable rc is now used in this function, it has also
+to be properly initialized there.
+
+Reported-by: Jochen Roderburg <roderburg@uni-koeln.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ mount.cifs.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index a1b0454..6f3f382 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -495,7 +495,7 @@ free_caps:
+ static int
+ toggle_dac_capability(int writable, int enable)
+ {
+-	int rc;
++	int rc = 0;
+ 	cap_t caps;
+ 	cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
+ 
+-- 
+1.7.7.6