diff --git a/.gitignore b/.gitignore
index 1297243..f56685d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /VirtualBox-6.1.2.tar.bz2
 /VirtualBox-6.1.4.tar.bz2
 /VirtualBox-6.1.6.tar.bz2
+/VirtualBox-6.1.8.tar.bz2
diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-5.2.10-xclient.patch
index 1f16bc7..920b569 100644
--- a/VirtualBox-5.2.10-xclient.patch
+++ b/VirtualBox-5.2.10-xclient.patch
@@ -1,5 +1,5 @@
---- VirtualBox-5.2.10.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2018-04-13 17:32:05.000000000 +0100
-+++ VirtualBox-5.2.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient	2018-04-22 04:31:42.483190045 +0100
+--- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2020-05-14 19:33:50.000000000 +0100
++++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient	2020-05-16 00:03:45.221363282 +0100
 @@ -21,15 +21,9 @@ for i in $HOME/.vboxclient-*.pid; do
      test -w $i || rm -f $i
  done
@@ -18,4 +18,4 @@
 +if [ -c /dev/vboxguest -a -z "${SSH_CONNECTION}" ]; then
    /usr/bin/VBoxClient --clipboard
    /usr/bin/VBoxClient --checkhostversion
-   /usr/bin/VBoxClient --display
+   /usr/bin/VBoxClient --seamless
diff --git a/sources b/sources
index ca42f0c..81c3799 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.1.6.tar.bz2) = 4a94417fe69c40755b55526cee67068ca8d32e71e5b6ebe0cccf46062dfb4ee76b33ac92f8b8f4748d438eda1714129360fdbaa39c16df3877b20109a7c6439a
+SHA512 (VirtualBox-6.1.8.tar.bz2) = 8dcac28cba659c72566e74ec05d8e06bcff8b23627d5368392c4add091f81a5f93550d9abefd96157718481bb60dfa610e0ae9266ecf882a7d36d62b1e84f671
diff --git a/update_vbox.sh b/update_vbox.sh
index b8f689b..743f8b4 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,19 +1,35 @@
-VERSION=6.1.6
+VERSION=6.1.8
 REL=1
 RAWHIDE=33
 BRANCHES="f32 f31 f30"
+if [ -z "$1" ]
+then
+      stage=0
+else
+      stage=$1
+fi
 
 git checkout master
 git pull
+if test $stage -le 0
+then
+echo STAGE 0
 rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to $VERSION" virtualbox-guest-additions.spec
 spectool -g virtualbox-guest-additions.spec
-fedpkg new-sources ./VirtualBox-$VERSION.tar.bz2
 fedpkg srpm && copr-cli build sergiomb/vboxfor23 virtualbox-guest-additions-$VERSION-$REL.fc$RAWHIDE.src.rpm
-echo Press enter to continue; read dummy;
+# to test i686 builds
+fedpkg scratch-build --srpm
+fi
+if test $stage -le 1
+then
+echo STAGE 1
+echo Press enter to upload sources; read dummy;
+fedpkg new-sources ./VirtualBox-$VERSION.tar.bz2
 fedpkg ci -c && git show
-echo Press enter to continue; read dummy;
+echo Press enter to push and build on rawhide; read dummy;
 fedpkg push && fedpkg build --nowait
 for BRANCH in $BRANCHES ; do
 echo Press enter to build $BRANCH to continue; read dummy;
 git checkout $BRANCH && git merge master && git push && fedpkg build --nowait; git checkout master
 done
+fi
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 2570330..832f549 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:    6.1.6
+Version:    6.1.8
 Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
@@ -168,6 +168,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Sat May 16 2020 Sérgio Basto <sergio@serjux.com> - 6.1.8-1
+- Update Virtualbox Guest Additions to 6.1.8
+
 * Thu Apr 16 2020 Sérgio Basto <sergio@serjux.com> - 6.1.6-1
 - Update Virtualbox Guest Additions to 6.1.6