diff --git a/vbox-shared-folder.diff b/vbox-shared-folder.diff
new file mode 100644
index 0000000..7d8dea3
--- /dev/null
+++ b/vbox-shared-folder.diff
@@ -0,0 +1,28 @@
+Index: src/VBox/Additions/linux/sharedfolders/dirops.c
+===================================================================
+--- src/VBox/Additions/linux/sharedfolders/dirops.c	(revision 48528)
++++ src/VBox/Additions/linux/sharedfolders/dirops.c	(revision 48529)
+@@ -282,10 +282,13 @@
+         }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+-        err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN);
++        if (!dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN))
++        {
++            LogFunc(("dir_emit failed\n"));
++            return 0;
++        }
+ #else
+         err = filldir(opaque, d_name, strlen(d_name), dir->f_pos, fake_ino, DT_UNKNOWN);
+-#endif
+         if (err)
+         {
+             LogFunc(("filldir returned error %d\n", err));
+@@ -293,6 +296,7 @@
+                only when it runs out of space in opaque */
+             return 0;
+         }
++#endif
+ 
+         dir->f_pos += 1;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
diff --git a/virtualbox.changes b/virtualbox.changes
index c68af37..72261be 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 24 23:34:41 UTC 2013 - mgorse@suse.com
+
+- added vbox-shared-folder.diff to fix shared folders (bnc#841673). 
+
 -------------------------------------------------------------------
 Wed Sep 25 11:35:04 UTC 2013 - wbauer@tmo.at
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 248e5ce..8ddfacb 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -146,6 +146,8 @@ Patch101:       vbox-default-os-type.diff
 Patch103:       vbox-disable-updates.diff
 #use pie/fPIE for setuid binaries (bnc#743143) 
 Patch104:       vbox-fpie.diff
+# Fix shared folders for 3.11, taken from upstream (bnc#841673)
+Patch105:       vbox-shared-folder.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -270,6 +272,7 @@ Development file for %{name}
 %patch101
 %patch103
 %patch104 -p1
+%patch105
 #copy user manual
 %__cp %{S:1} UserManual.pdf
 #copy kbuild config