diff --git a/.gitignore b/.gitignore
index abe2dc3..1297243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /VirtualBox-6.1.0.tar.bz2
 /VirtualBox-6.1.2.tar.bz2
 /VirtualBox-6.1.4.tar.bz2
+/VirtualBox-6.1.6.tar.bz2
diff --git a/Clipboard.patch b/Clipboard.patch
deleted file mode 100644
index 6df543f..0000000
--- a/Clipboard.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Shared Clipboard: ticketref:19336 Linux guest: shared clipboard doesn't work (on fresh VirtualBox-6.1.4-136177)
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@83184 cfe28804-0f27-0410-a406-dd0f0b0b656f
-diff --git trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
-index ad9e3bf69c..9063b212cd 100644
---- trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
-+++ trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
-@@ -107,7 +107,7 @@ DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT
-     else
- #endif
-     {
--        uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */
-+        uint32_t cbData = _4K; /** @todo Make this dynamic. */
-         void    *pvData = RTMemAlloc(cbData);
-         if (pvData)
-         {
-@@ -215,7 +215,6 @@ DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int
-  *
-  * @returns VBox status code.
-  */
--#if 0
- static int vboxClipboardConnect(void)
- {
-     LogFlowFuncEnter();
-@@ -245,7 +244,6 @@ static int vboxClipboardConnect(void)
-     LogFlowFuncLeaveRC(rc);
-     return rc;
- }
--#endif
- 
- /**
-  * The main loop of our clipboard reader.
-@@ -469,7 +467,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
-     RT_NOREF(ppInterface, fDaemonised);
- 
-     /* Initialise the guest library. */
--    int rc = 0; //vboxClipboardConnect();
-+    int rc = vboxClipboardConnect();
-     if (RT_SUCCESS(rc))
-     {
- #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-@@ -477,9 +475,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
-         if (RT_SUCCESS(rc))
-         {
- #endif
--            RTThreadSleep(60 * 1000);
--
--            //rc = vboxClipboardMain();
-+            rc = vboxClipboardMain();
- 
- #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-             int rc2 = vboxClipboardFUSEStop();
diff --git a/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
deleted file mode 100644
index 27ba6b2..0000000
--- a/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
---- VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~	2020-02-18 18:13:08.000000000 +0100
-+++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp	2020-03-03 16:27:49.947341705 +0100
-@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
-     {
-         XCloseDisplay(pContext->pDisplay);
-         pContext->pDisplay = NULL;
-+        return;
-     }
-     if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase, &pContext->hRandRErrorBase))
-     {
-         XCloseDisplay(pContext->pDisplay);
-         pContext->pDisplay = NULL;
-+        return;
-     }
-     if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor, &pContext->hRandRMinor))
-     {
-         XCloseDisplay(pContext->pDisplay);
-         pContext->pDisplay = NULL;
-+        return;
-     }
-     pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
- }
diff --git a/sources b/sources
index fa4d84e..ca42f0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.1.4.tar.bz2) = 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167
+SHA512 (VirtualBox-6.1.6.tar.bz2) = 4a94417fe69c40755b55526cee67068ca8d32e71e5b6ebe0cccf46062dfb4ee76b33ac92f8b8f4748d438eda1714129360fdbaa39c16df3877b20109a7c6439a
diff --git a/update_vbox.sh b/update_vbox.sh
index 8bd2916..b8f689b 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.1.4
+VERSION=6.1.6
 REL=1
 RAWHIDE=33
 BRANCHES="f32 f31 f30"
diff --git a/vboxservice.service b/vboxservice.service
index a948a35..24e9b9b 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -3,6 +3,10 @@ Description=VirtualBox guest services
 ConditionVirtualization=|oracle
 
 [Service]
+ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/bin/modprobe vboxvideo
+ExecStartPre=-/usr/bin/modprobe vboxsf
+#ExecStartPre=-/usr/bin/VBoxClient --vmsvga
 ExecStart=/usr/sbin/VBoxService -f
 
 [Install]
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 08e7c65..2570330 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,8 +1,8 @@
 %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
 
 Name:       virtualbox-guest-additions
-Version:    6.1.4
-Release:    4%{?dist}
+Version:    6.1.6
+Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -16,11 +16,6 @@ Source3:    VirtualBox-60-vboxguest.rules
 Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
 # Do not show an error dialog when not running under vbox
 Patch3:     VirtualBox-5.2.10-xclient.patch
-# Fix for https://www.virtualbox.org/ticket/19357 / rhbz#1806778
-Patch4:     VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
-#Shared Clipboard: ticketref:19336 Linux guest: shared clipboard doesn't work (on fresh VirtualBox-6.1.4-136177)
-#git-svn-id: http://www.virtualbox.org/svn/vbox@83184 cfe28804-0f27-0410-a406-dd0f0b0b656f
-Patch5:     Clipboard.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  kBuild >= 0.1.9998.r3093
@@ -173,6 +168,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Thu Apr 16 2020 Sérgio Basto <sergio@serjux.com> - 6.1.6-1
+- Update Virtualbox Guest Additions to 6.1.6
+
 * Wed Mar 11 2020 Sérgio Basto <sergio@serjux.com> - 6.1.4-4
 - koji test