diff --git a/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch b/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
deleted file mode 100644
index d2ef03c..0000000
--- a/trunk/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
-index 6ad7df3e..2f12c277 100644
---- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
-+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
-@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32
-  */
- DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient)
- {
-+
-+    return false;
-+
-     /*
-      * Seems we get VINF_SUCCESS back from the host if we try unsupported
-      * guest control functions, so we need to supply some random message
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index c6f6c36..55c97b7 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -10,8 +10,7 @@ pkgname=('virtualbox'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
 pkgver=6.0.2
-pkgrel=1
-_vboxsf_commit='9451f61e6787e95aa51e42b6381db6b059bc49da'
+pkgrel=99
 arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -20,6 +19,7 @@ makedepends=('alsa-lib'
              'cdrkit'
              'curl'
              'dev86'
+             'lib32-gcc-libs'
              'device-mapper'
              'git'
              'glu'
@@ -54,12 +54,8 @@ makedepends=('alsa-lib'
              'xorg-server-devel')
 makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
-        # We need to build a modified version of vboxsf for Linux 4.16
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
-        "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit"
         'virtualbox-host-dkms.conf'
         'virtualbox-guest-dkms.conf'
-        'virtualbox-vboxsf-dkms.conf'
         'virtualbox.sysusers'
         'virtualbox-guest-utils.sysusers'
         '60-vboxdrv.rules'
@@ -75,16 +71,13 @@ source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver
         '008-no-vboxvideo.patch'
         '009-include-path.patch'
         '011-python-3-7.patch'
-        '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         # The following patch and mount.vboxsf wrapper should be removed
         # once support for mainline-style options string gets upstreamed
         '101-vboxsf-automount.patch'
         'mount.vboxsf')
 sha256sums=('fa31b4c6cf94ac908cf89d290cab5795c86d6307cd3857b31ae85faa1eaf0c81'
-            'SKIP'
             'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
-            'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
-            'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b'
+            '21c27223316fb3554c67ae958c6b620da4e659ca1e26d4fcda9578c780be5639'
             '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
             'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
             '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
@@ -100,7 +93,6 @@ sha256sums=('fa31b4c6cf94ac908cf89d290cab5795c86d6307cd3857b31ae85faa1eaf0c81'
             '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
             '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
             '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
-            '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
             'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
             'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')
 
@@ -321,14 +313,6 @@ package_virtualbox-guest-dkms() {
     install -Dm0644 "$srcdir/$pkgname.conf" "$_p"
     sed -i "s,@VERSION@,$pkgver," "$_p"
 
-    # vboxsf module for Linux 4.16 and later
-    install -d "$pkgdir/usr/src/vboxsf-${pkgver}_OSE"
-    cp -rT "$srcdir/vboxsf" "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf"
-    rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"
-    echo "obj-m = vboxsf/" >"$pkgdir/usr/src/vboxsf-${pkgver}_OSE/Makefile"
-    local _p="$pkgdir/usr/src/vboxsf-${pkgver}_OSE/dkms.conf"
-    install -Dm0644 "$srcdir/virtualbox-vboxsf-dkms.conf" "$_p"
-    sed -i "s,@VERSION@,$pkgver," "$_p"
 }
 
 package_virtualbox-guest-utils() {
diff --git a/trunk/virtualbox-guest-dkms.conf b/trunk/virtualbox-guest-dkms.conf
index 334dac6..eeba994 100644
--- a/trunk/virtualbox-guest-dkms.conf
+++ b/trunk/virtualbox-guest-dkms.conf
@@ -19,16 +19,16 @@ PACKAGE_VERSION=@VERSION@_OSE
 AUTOINSTALL=yes
 
 # Build only for kernels before Linux 4.16
-BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
+#BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
 
 BUILT_MODULE_NAME[0]="vboxguest"
 BUILT_MODULE_LOCATION[0]="vboxguest"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
+DEST_MODULE_LOCATION[0]="/updates"
 
 BUILT_MODULE_NAME[1]="vboxsf"
 BUILT_MODULE_LOCATION[1]="vboxsf"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
+DEST_MODULE_LOCATION[1]="/updates"
 
 BUILT_MODULE_NAME[2]="vboxvideo"
 BUILT_MODULE_LOCATION[2]="vboxvideo"
-DEST_MODULE_LOCATION[2]="/kernel/misc"
+DEST_MODULE_LOCATION[2]="/updates"
diff --git a/trunk/virtualbox-vboxsf-dkms.conf b/trunk/virtualbox-vboxsf-dkms.conf
deleted file mode 100644
index c1f43b3..0000000
--- a/trunk/virtualbox-vboxsf-dkms.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-PACKAGE_NAME="vboxsf"
-PACKAGE_VERSION=@VERSION@_OSE
-AUTOINSTALL=yes
-
-# Build only for Linux 4.16 and later (until it gets upstreamed...)
-BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\..*)"
-
-BUILT_MODULE_NAME[0]="vboxsf"
-BUILT_MODULE_LOCATION[0]="vboxsf"
-DEST_MODULE_LOCATION[0]="/kernel/misc"