diff --git a/.gitignore b/.gitignore
index 271e491..f7d24fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /VirtualBox-5.2.6.tar.bz2
 /VirtualBox-5.2.8.tar.bz2
 /VirtualBox-5.2.10.tar.bz2
+/VirtualBox-5.2.12.tar.bz2
diff --git a/010-linux-4.16-mount-fixes.patch b/010-linux-4.16-mount-fixes.patch
new file mode 100644
index 0000000..08f3b53
--- /dev/null
+++ b/010-linux-4.16-mount-fixes.patch
@@ -0,0 +1,35 @@
+This ghetto patch attempts to fix shared folder automounting for guests running
+Linux 4.16, and also suggests an alternative to mount.vboxsf.
+
+diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+--- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	2018-02-26 17:57:30.000000000 +0200
++++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp	2018-04-07 21:00:05.785735622 +0300
+@@ -329,6 +329,13 @@ static int vbsvcAutoMountSharedFolder(co
+                       "vboxsf",
+                       fFlags,
+                       szOptBuf);
++        if (r == -1 && errno == EINVAL)
++        {
++            /* Mainline vboxsf accepts regular mount opts. */
++            char mount_opts[1024];
++            snprintf(mount_opts, 1024, "%s,dmode=0770,fmode=0770", szOptBuf);
++            r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
++        }
+         if (r == 0)
+         {
+             VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
+diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c
+--- VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c	2018-02-26 17:57:34.000000000 +0200
++++ VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c	2018-04-07 21:39:38.121577588 +0300
+@@ -485,6 +485,11 @@ main(int argc, char **argv)
+      *       to keep this code here slick without having VbglR3.
+      */
+     err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
++    if (err == -1 && errno == EINVAL)
++    {
++        /* The mount.vboxsf helper should not be used with mainline vboxsf. */
++        panic("mount.vboxsf cannot be used with mainline vboxsf; instead use:\n\n    mount -cit vboxsf NAME MOUNTPOINT\n\n");
++    }
+     if (err == -1 && errno == EPROTO)
+     {
+         /* Sometimes the mount utility messes up the share name.  Try to
diff --git a/sources b/sources
index 66f1cb4..4708eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-5.2.10.tar.bz2) = 1e6d5e5c6ce45d9a3864860819f6301c192c83be154c674cfb37c98506db88a8f70526ec05d115c53e40c4c91d243513f0a3196261c7dee244a18091b2e5717e
+SHA512 (VirtualBox-5.2.12.tar.bz2) = 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 327f246..2c8d99f 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,7 +1,7 @@
 %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
 
 Name:       virtualbox-guest-additions
-Version:    5.2.10
+Version:    5.2.12
 Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
@@ -21,6 +21,8 @@ Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
 Patch3:     VirtualBox-5.2.10-xclient.patch
 # Fix build with gcc8
 Patch4:     VirtualBox-5.2.6-gcc8.patch
+# From Archlinux
+Patch10:    010-linux-4.16-mount-fixes.patch
 
 BuildRequires:  kBuild >= 0.1.9998.r3093
 BuildRequires:  python2-devel
@@ -108,12 +110,12 @@ kmk %{_smp_mflags}                                             \
     VBOX_WITH_VALIDATIONKIT=                                   \
     VBOX_USE_SYSTEM_XORG_HEADERS=1                             \
     VBOX_USE_SYSTEM_GL_HEADERS=1                               \
+    VBOX_NO_LEGACY_XORG_X11=1                                  \
     SDK_VBOX_LIBPNG_INCS=""                                    \
     SDK_VBOX_LIBXML2_INCS=""                                   \
     SDK_VBOX_OPENSSL_INCS=""                                   \
     SDK_VBOX_OPENSSL_LIBS="ssl crypto"                         \
-    SDK_VBOX_ZLIB_INCS=                                        \
-    VBOX_NO_LEGACY_XORG_X11=1                                  \
+    SDK_VBOX_ZLIB_INCS=""                                      \
     VBOX_BUILD_PUBLISHER=_Fedora
 
 
@@ -190,6 +192,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Sat May 12 2018 Sérgio Basto <sergio@serjux.com> - 5.2.12-1
+- Update to 5.2.12
+
 * Sun Apr 22 2018 Sérgio Basto <sergio@serjux.com> - 5.2.10-1
 - Update to 5.2.10