diff --git a/UserManual.pdf b/UserManual.pdf
index 8e01de5..60254fc 100644
--- a/UserManual.pdf
+++ b/UserManual.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d42ff4874bf755bbd24926ecce68ceace8f00f9a098f829ecf2dcb66040354e
-size 3492049
+oid sha256:29d3963621a4b98f9996f90745303b1885d5271807a85aa021ea11ac3cfa29a6
+size 4286798
diff --git a/VirtualBox-5.0.18-patched.tar.bz2 b/VirtualBox-5.0.18-patched.tar.bz2
deleted file mode 100644
index c66f658..0000000
--- a/VirtualBox-5.0.18-patched.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b44ac9e8c701158848ebdfbd1240845f58fa81d31b13fe87e5bf0a671b7453bd
-size 76907449
diff --git a/VirtualBox-5.1.2-patched.tar.bz2 b/VirtualBox-5.1.2-patched.tar.bz2
new file mode 100644
index 0000000..6e0e1a0
--- /dev/null
+++ b/VirtualBox-5.1.2-patched.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b69ddfec90af250cdc0ec4e815130cdf9fb1ec90971c6ec002d0f2c60690bc5
+size 80026177
diff --git a/changeset_60565.diff b/changeset_60565.diff
index 6828205..5c81a88 100644
--- a/changeset_60565.diff
+++ b/changeset_60565.diff
@@ -1,10 +1,10 @@
-Index: VirtualBox-5.0.18/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+Index: VirtualBox-5.1.2/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
 ===================================================================
---- VirtualBox-5.0.18.orig/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
-+++ VirtualBox-5.0.18/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
-@@ -3889,7 +3889,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIO
-     else if (RT_FAILURE(rc))
-         AssertMsgFailed(("Writing BIOS register failed %Rrc\n", rc));
+--- VirtualBox-5.1.2.orig/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
++++ VirtualBox-5.1.2/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+@@ -3771,7 +3771,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIO
+     Log2(("%s: pu32=%p:{%.*Rhxs} iRegister=%d rc=%Rrc\n",
+           __FUNCTION__, pu32, 1, pu32, iRegister, rc));
  
 -    return rc;
 +    return VINF_SUCCESS;
diff --git a/drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch b/drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch
deleted file mode 100644
index 2a7b6f1..0000000
--- a/drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Egbert Eich <eich@suse.de>
-Date: Mon Apr 25 16:47:41 2016 +0200
-Subject: drm/vboxvideo: Add delayed update to support fbdev
-Patch-mainline: Not yet
-Git-commit: 0671f61d2a240e26c02d5a4d5cb993e1a446e601
-References: boo#977200
-
-Due to the virtrual nature of the emulated hardware, the
-hardware needs help to know about updates to screen content.
-The fb layer provides this with 'deferred IO'.
-This patch adds support for this to the vboxvideo DRM driver.
-
-Signed-off-by: Egbert Eich <eich@suse.de>
-Signed-off-by: Egbert Eich <eich@suse.com>
----
- src/VBox/Additions/linux/drm/vbox_fb.c | 36 ++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
-index 8e0e40d..e8c5a60 100644
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -68,6 +68,7 @@
- #include <drm/drm_crtc_helper.h>
- #include "vbox_drv.h"
- 
-+#define VBOX_DIRTY_DELAY (HZ / 30)
- /**
-  * Tell the host about dirty rectangles to update.
-  */
-@@ -162,6 +163,38 @@ static void vbox_dirty_update(struct vbox_fbdev *fbdev,
-     vbox_bo_unreserve(bo);
- }
- 
-+static void vbox_deferred_io(struct fb_info *info,
-+                             struct list_head *pagelist)
-+{
-+        struct vbox_fbdev *fbdev = info->par;
-+        unsigned long start, end, min, max;
-+        struct page *page;
-+        int y1, y2;
-+
-+        min = ULONG_MAX;
-+        max = 0;
-+        list_for_each_entry(page, pagelist, lru) {
-+                start = page->index << PAGE_SHIFT;
-+                end = start + PAGE_SIZE - 1;
-+                min = min(min, start);
-+                max = max(max, end);
-+        }
-+
-+        if (min < max) {
-+                y1 = min / info->fix.line_length;
-+                y2 = (max / info->fix.line_length) + 1;
-+                printk(KERN_INFO "%s: Calling dirty update: 0, %d, %d, %d\n",
-+                       __func__, y1, info->var.xres, y2 - y1 - 1);
-+                vbox_dirty_update(fbdev, 0, y1, info->var.xres, y2 - y1 - 1);
-+        }
-+}
-+
-+static struct fb_deferred_io vbox_defio =
-+{
-+        .delay          = VBOX_DIRTY_DELAY,
-+        .deferred_io    = vbox_deferred_io,
-+};
-+
- static void vbox_fillrect(struct fb_info *info,
-              const struct fb_fillrect *rect)
- {
-@@ -324,6 +357,9 @@ static int vboxfb_create(struct drm_fb_helper *helper,
-     info->screen_base = sysram;
-     info->screen_size = size;
- 
-+    info->fbdefio = &vbox_defio;
-+    fb_deferred_io_init(info);
-+
-     info->pixmap.flags = FB_PIXMAP_SYSTEM;
- 
-     DRM_DEBUG_KMS("allocated %dx%d\n",
diff --git a/drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch b/drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch
deleted file mode 100644
index aeb691d..0000000
--- a/drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Egbert Eich <eich@suse.de>
-Date: Mon Apr 25 09:32:04 2016 +0200
-Subject: drm/vboxvideo: Initialize data needed to map fbdev memory
-Patch-mainline: Not yet
-Git-commit: 4153ec3d267288659638e2397bcae5298e7f5930
-References: boo#977200
-
-Due to a missing initialization there was no way to map fbdev memory.
-Thus for example using the Xserver with the fbdev driver failed.
-This fix adds initialization for fix.smem_start and fix.smem_len
-in the fb_info structure, which fixes this problem.
-
-Signed-off-by: Egbert Eich <eich@suse.de>
-Signed-off-by: Egbert Eich <eich@suse.com>
----
- src/VBox/Additions/linux/drm/vbox_drv.h  | 1 +
- src/VBox/Additions/linux/drm/vbox_fb.c   | 8 ++++++++
- src/VBox/Additions/linux/drm/vbox_mode.c | 2 ++
- 3 files changed, 11 insertions(+)
-diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h
-index fa3eb3c..a9bc156 100644
---- a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -227,6 +227,7 @@ int vbox_framebuffer_init(struct drm_device *dev,
- int vbox_fbdev_init(struct drm_device *dev);
- void vbox_fbdev_fini(struct drm_device *dev);
- void vbox_fbdev_set_suspend(struct drm_device *dev, int state);
-+void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr);
- 
- struct vbox_bo {
-     struct ttm_buffer_object bo;
-diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
-index a90f11d..8e0e40d 100644
---- a/src/VBox/Additions/linux/drm/vbox_fb.c
-+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
-@@ -452,3 +452,11 @@ void vbox_fbdev_set_suspend(struct drm_device *dev, int state)
- 
-     fb_set_suspend(vbox->fbdev->helper.fbdev, state);
- }
-+
-+void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr)
-+{
-+        vbox->fbdev->helper.fbdev->fix.smem_start =
-+                vbox->fbdev->helper.fbdev->apertures->ranges[0].base +
-+                gpu_addr;
-+        vbox->fbdev->helper.fbdev->fix.smem_len = vbox->vram_size - gpu_addr;
-+}
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
-index d00ebff..40b6eb0 100644
---- a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -224,6 +224,8 @@ static int vbox_crtc_do_set_base(struct drm_crtc *crtc,
-         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
-         if (ret)
-             DRM_ERROR("failed to kmap fbcon\n");
-+        else
-+            vbox_fbdev_set_base(vbox, gpu_addr);
-     }
-     vbox_bo_unreserve(bo);
- 
diff --git a/gcc5-real-support.patch b/gcc5-real-support.patch
index abea36b..5256e7d 100644
--- a/gcc5-real-support.patch
+++ b/gcc5-real-support.patch
@@ -1,7 +1,8 @@
-diff -urN VirtualBox-5.0.0.old/Config.kmk VirtualBox-5.0.0/Config.kmk
---- VirtualBox-5.0.0.old/Config.kmk	2015-07-11 13:17:27.273698360 +0200
-+++ VirtualBox-5.0.0/Config.kmk	2015-07-11 13:36:31.958812088 +0200
-@@ -2344,7 +2344,7 @@
+Index: VirtualBox-5.1.2/Config.kmk
+===================================================================
+--- VirtualBox-5.1.2.orig/Config.kmk
++++ VirtualBox-5.1.2/Config.kmk
+@@ -2542,7 +2542,7 @@ else
   # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
   # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
   VBOX_GCC_VERSION = $(shell \
@@ -10,10 +11,11 @@ diff -urN VirtualBox-5.0.0.old/Config.kmk VirtualBox-5.0.0/Config.kmk
  endif
  
  # Find MinGW cross compilers for EFI on non-windows systems. We need to probe
-diff -urN VirtualBox-5.0.0.old/configure VirtualBox-5.0.0/configure
---- VirtualBox-5.0.0.old/configure	2015-07-11 13:17:27.273698360 +0200
-+++ VirtualBox-5.0.0/configure	2015-07-11 13:37:30.457915488 +0200
-@@ -410,8 +410,13 @@
+Index: VirtualBox-5.1.2/configure
+===================================================================
+--- VirtualBox-5.1.2.orig/configure
++++ VirtualBox-5.1.2/configure
+@@ -431,8 +431,13 @@ check_gcc()
          log_failure "cannot execute '$CXX -dumpversion'"
          fail really
        fi
diff --git a/smap.diff b/smap.diff
index fc98a14..b17ae84 100644
--- a/smap.diff
+++ b/smap.diff
@@ -1,8 +1,8 @@
-Index: VirtualBox-4.3.28/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+Index: VirtualBox-5.1.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
 ===================================================================
---- VirtualBox-4.3.28.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ VirtualBox-4.3.28/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -48,6 +48,12 @@
+--- VirtualBox-5.1.2.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
++++ VirtualBox-5.1.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+@@ -50,6 +50,12 @@
  # include <iprt/power.h>
  # define VBOX_WITH_SUSPEND_NOTIFICATION
  #endif
diff --git a/vbox-4.7.patch b/vbox-4.7.patch
deleted file mode 100644
index 8d428f5..0000000
--- a/vbox-4.7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Index: VirtualBox-5.0.18/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-===================================================================
---- VirtualBox-5.0.18.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-+++ VirtualBox-5.0.18/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
-@@ -152,7 +152,11 @@ static int vboxNetAdpLinuxXmit(struct sk
-     pPriv->Stats.tx_packets++;
-     pPriv->Stats.tx_bytes += pSkb->len;
-     /* Update transmission time stamp. */
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    netif_trans_update(pNetDev);
-+# else
-     pNetDev->trans_start = jiffies;
-+# endif
-     /* Nothing else to do, just free the sk_buff. */
-     dev_kfree_skb(pSkb);
-     return 0;
-Index: VirtualBox-5.0.18/src/VBox/Additions/linux/drm/vbox_drv.h
-===================================================================
---- VirtualBox-5.0.18.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-5.0.18/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -285,7 +285,11 @@ static inline int vbox_bo_reserve(struct
- {
-     int ret;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    ret = ttm_bo_reserve(&bo->bo, true, no_wait, NULL);
-+#else
-     ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0);
-+#endif
-     if (ret)
-     {
-         if (ret != -ERESTARTSYS && ret != -EBUSY)
-Index: VirtualBox-5.0.18/src/VBox/Additions/linux/drm/vbox_main.c
-===================================================================
---- VirtualBox-5.0.18.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-5.0.18/src/VBox/Additions/linux/drm/vbox_main.c
-@@ -203,7 +203,11 @@ vbox_user_framebuffer_create(struct drm_
-     int ret;
- 
-     LogFunc(("vboxvideo: %d\n", __LINE__));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
-+#else
-     obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]);
-+#endif
-     if (obj == NULL)
-         return ERR_PTR(-ENOENT);
- 
-@@ -546,7 +550,11 @@ vbox_dumb_mmap_offset(struct drm_file *f
-     LogFunc(("vboxvideo: %d: dev=%p, handle=%u\n", __LINE__,
-              dev, (unsigned)handle));
-     mutex_lock(&dev->struct_mutex);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    obj = drm_gem_object_lookup(file, handle);
-+#else
-     obj = drm_gem_object_lookup(dev, file, handle);
-+#endif
-     if (obj == NULL) {
-         ret = -ENOENT;
-         goto out_unlock;
-Index: VirtualBox-5.0.18/src/VBox/Additions/linux/drm/vbox_mode.c
-===================================================================
---- VirtualBox-5.0.18.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ VirtualBox-5.0.18/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -714,7 +714,11 @@ static int vbox_cursor_set2(struct drm_c
-         || !(caps & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE))
-         return -EINVAL;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    obj = drm_gem_object_lookup(file_priv, handle);
-+#else
-     obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-+#endif
-     if (obj)
-     {
-         bo = gem_to_vbox_bo(obj);
diff --git a/vbox-default-os-type.diff b/vbox-default-os-type.diff
index ebb9913..915f99f 100644
--- a/vbox-default-os-type.diff
+++ b/vbox-default-os-type.diff
@@ -1,8 +1,10 @@
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2014-02-25 18:08:58.000000000 +0100
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2014-03-03 15:18:07.298245235 +0100
-@@ -203,15 +203,15 @@
+Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
++++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+@@ -327,15 +327,15 @@ void UINameAndSystemEditor::sltFamilyCha
          if (iIndexWin7 != -1)
-             m_pTypeCombo->setCurrentIndex(iIndexWin7);
+             m_pComboType->setCurrentIndex(iIndexWin7);
      }
 -    /* Or select Ubuntu item for Linux family as default: */
 +    /* Or select openSUSE item for Linux family as default: */
@@ -12,12 +14,12 @@
 +        QString strDefaultID = "openSUSE";
          if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
              strDefaultID += "_64";
--        int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID);
+-        const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID);
 -        if (iIndexUbuntu != -1)
--            m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
-+        int iIndexopenSUSE = m_pTypeCombo->findData(strDefaultID, TypeID);
-+        if (iIndexopenSUSE != -1)
-+            m_pTypeCombo->setCurrentIndex(iIndexopenSUSE);
+-            m_pComboType->setCurrentIndex(iIndexUbuntu);
++        const int iIndexOpenSUSE = m_pComboType->findData(strDefaultID, TypeID);
++        if (iIndexOpenSUSE != -1)
++            m_pComboType->setCurrentIndex(iIndexOpenSUSE);
      }
      /* Else simply select the first one present: */
-     else m_pTypeCombo->setCurrentIndex(0);
+     else
diff --git a/vbox-deprec-gsoap-service-proxies.diff b/vbox-deprec-gsoap-service-proxies.diff
index db1751b..6eba76a 100644
--- a/vbox-deprec-gsoap-service-proxies.diff
+++ b/vbox-deprec-gsoap-service-proxies.diff
@@ -1,7 +1,8 @@
-diff -Pdpru VirtualBox-4.3.18.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-4.3.18/src/VBox/Main/webservice/Makefile.kmk
---- VirtualBox-4.3.18.orig/src/VBox/Main/webservice/Makefile.kmk	2014-10-11 14:07:33.000000000 +0200
-+++ VirtualBox-4.3.18/src/VBox/Main/webservice/Makefile.kmk	2014-10-13 17:10:53.689539003 +0200
-@@ -683,7 +683,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
+Index: VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Main/webservice/Makefile.kmk
++++ VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
+@@ -707,7 +707,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
  : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
diff --git a/vbox-disable-updates.diff b/vbox-disable-updates.diff
index efbcc92..44136fd 100644
--- a/vbox-disable-updates.diff
+++ b/vbox-disable-updates.diff
@@ -1,7 +1,8 @@
-diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
---- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp	2015-07-11 13:17:27.885699492 +0200
-+++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp	2015-07-11 13:21:56.912197474 +0200
-@@ -68,7 +68,7 @@
+Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
++++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+@@ -68,7 +68,7 @@ void UIGlobalSettingsUpdate::loadToCache
  void UIGlobalSettingsUpdate::getFromCache()
  {
      /* Apply internal variables data to QWidget(s): */
@@ -10,10 +11,11 @@ diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global
      if (m_pCheckBoxUpdate->isChecked())
      {
          m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex);
-diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2015-07-11 13:17:27.885699492 +0200
-+++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2015-07-11 13:23:13.230338850 +0200
-@@ -106,16 +106,6 @@
+Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -104,16 +104,6 @@ UISettingsDialogGlobal::UISettingsDialog
                              iPageIndex, "#input", pSettingsPage);
                      break;
                  }
@@ -30,7 +32,7 @@ diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISett
                  /* Language page: */
                  case GlobalSettingsPageType_Language:
                  {
-@@ -254,8 +244,6 @@
+@@ -252,8 +242,6 @@ void UISettingsDialogGlobal::retranslate
      m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
  
  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
diff --git a/vbox-fpie.diff b/vbox-fpie.diff
index 3cd67b3..787b0d1 100644
--- a/vbox-fpie.diff
+++ b/vbox-fpie.diff
@@ -1,8 +1,8 @@
-Index: VirtualBox-4.3.14/Config.kmk
+Index: VirtualBox-5.1.2/Config.kmk
 ===================================================================
---- VirtualBox-4.3.14.orig/Config.kmk
-+++ VirtualBox-4.3.14/Config.kmk
-@@ -3963,6 +3963,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
+--- VirtualBox-5.1.2.orig/Config.kmk
++++ VirtualBox-5.1.2/Config.kmk
+@@ -4635,6 +4635,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
  ifeq ($(KBUILD_TARGET),linux)
  # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
  # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
@@ -12,10 +12,10 @@ Index: VirtualBox-4.3.14/Config.kmk
  endif
  ifeq ($(KBUILD_TARGET),win) # No CRT!
   TEMPLATE_VBOXR3HARDENEDEXE_SDKS          = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
-@@ -3981,8 +3984,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
-  TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86       = $(NOT_SUCH_VARIABLE)
+@@ -4654,8 +4657,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
   TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64     = $(NOT_SUCH_VARIABLE)
- else ifn1of ($(KBUILD_TARGET), os2)
+ else ifn1of ($(KBUILD_TARGET), os2 solaris)
+  # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
 - TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
 - TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
 + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) -pie
diff --git a/vbox-gsoapssl-deps.diff b/vbox-gsoapssl-deps.diff
index ef48be9..7449e5f 100644
--- a/vbox-gsoapssl-deps.diff
+++ b/vbox-gsoapssl-deps.diff
@@ -1,7 +1,7 @@
-Index: VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
+Index: VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
 ===================================================================
---- VirtualBox-4.3.6.orig/src/VBox/Main/webservice/Makefile.kmk
-+++ VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
+--- VirtualBox-5.1.2.orig/src/VBox/Main/webservice/Makefile.kmk
++++ VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
 @@ -303,6 +303,7 @@ endif
   vboxwebsrv_LIBS += \
  	$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
@@ -10,7 +10,7 @@ Index: VirtualBox-4.3.6/src/VBox/Main/webservice/Makefile.kmk
  	$(LIB_RUNTIME)
   vboxwebsrv_LIBS.solaris += socket nsl
   ifdef VBOX_WITH_WEBSERVICES_SSL
-@@ -480,6 +481,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
+@@ -483,6 +484,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
   webtest_LIBS += \
  	$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
  	$(VBOX_GSOAP_CXX_LIBS) \
diff --git a/vbox-no-build-dates.diff b/vbox-no-build-dates.diff
index 30c0a71..cd4ea02 100644
--- a/vbox-no-build-dates.diff
+++ b/vbox-no-build-dates.diff
@@ -155,7 +155,7 @@ Index: src/VBox/Main/glue/com.cpp
 ===================================================================
 --- src/VBox/Main/glue/com.cpp.orig
 +++ src/VBox/Main/glue/com.cpp
-@@ -292,7 +292,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
+@@ -283,7 +283,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
  #endif
                     "Log opened %s\n",
                     g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
@@ -168,7 +168,7 @@ Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
 ===================================================================
 --- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
 +++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
-@@ -238,7 +238,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
+@@ -241,7 +241,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
                     "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
                     "Log opened %s\n",
                     RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
diff --git a/vbox-permissions_warning.diff b/vbox-permissions_warning.diff
index 4346c8d..3e53e26 100644
--- a/vbox-permissions_warning.diff
+++ b/vbox-permissions_warning.diff
@@ -14,7 +14,7 @@ Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
 ===================================================================
 --- /dev/null
 +++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,35 @@
 +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
 +## @file
 +#
@@ -38,9 +38,13 @@ Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
 +
 +PROGRAMS += VBoxPermissionMessage
 +
-+VBoxPermissionMessage_TEMPLATE = VBOXQT4GUIEXE
++VBoxPermissionMessage_TEMPLATE = VBOXQTGUIEXE
 +VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp
 +VBoxPermissionMessage_QT_MODULES = Core Gui
++ifdef VBOX_WITH_QTGUI_V5
++ # Qt5 requires additional modules:
++ VBoxPermissionMessage_QT_MODULES += Widgets
++endif # VBOX_WITH_QTGUI_V5
 +
 +#INSTALLS += VBoxPermissionMessage
 +
@@ -51,8 +55,8 @@ Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
 --- /dev/null
 +++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
 @@ -0,0 +1,12 @@
-+#include <QtGui/QApplication>
-+#include <QtGui/QMessageBox>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
 +int main(int argc, char *argv[])
 +{
 +        QApplication app(argc, argv);
diff --git a/vbox-python-detection.diff b/vbox-python-detection.diff
index a0948fb..d51ac34 100644
--- a/vbox-python-detection.diff
+++ b/vbox-python-detection.diff
@@ -1,8 +1,8 @@
-Index: VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py
+Index: VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
 ===================================================================
---- VirtualBox-4.3.6.orig/src/libs/xpcom18a4/python/gen_python_deps.py
-+++ VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py
-@@ -71,7 +71,7 @@ def main(argv):
+--- VirtualBox-5.1.2.orig/src/libs/xpcom18a4/python/gen_python_deps.py
++++ VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
+@@ -75,7 +75,7 @@ def main(argv):
      else:
          multi = 1
  
@@ -11,15 +11,15 @@ Index: VirtualBox-4.3.6/src/libs/xpcom18a4/python/gen_python_deps.py
          prefixes = ["/usr"]
          versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])]
  
-@@ -92,22 +92,23 @@ def main(argv):
-     for v in versions:
+@@ -98,22 +98,23 @@ def main(argv):
+             continue
          for p in prefixes:
              c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
 -            if c is not None:
 +            if c:
                  known[v] = c
                  break
--    keys = known.keys()
+-    keys = list(known.keys())
 -    # we want default to be the lowest versioned Python
 -    keys.sort()
 -    d = None
diff --git a/vbox-smc-napa.diff b/vbox-smc-napa.diff
index 7711fc1..aa27f05 100644
--- a/vbox-smc-napa.diff
+++ b/vbox-smc-napa.diff
@@ -1,8 +1,8 @@
-Index: VirtualBox-4.3.6/src/VBox/Devices/PC/vbox.dsl
+Index: VirtualBox-5.1.2/src/VBox/Devices/PC/vbox.dsl
 ===================================================================
---- VirtualBox-4.3.6.orig/src/VBox/Devices/PC/vbox.dsl
-+++ VirtualBox-4.3.6/src/VBox/Devices/PC/vbox.dsl
-@@ -848,7 +848,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1,
+--- VirtualBox-5.1.2.orig/src/VBox/Devices/PC/vbox.dsl
++++ VirtualBox-5.1.2/src/VBox/Devices/PC/vbox.dsl
+@@ -1179,7 +1179,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1,
                  Device (SMC)
                  {
                      Name (_HID, EisaId ("APP0001"))
diff --git a/vbox-usb-warning.diff b/vbox-usb-warning.diff
index f6461ac..56b9946 100644
--- a/vbox-usb-warning.diff
+++ b/vbox-usb-warning.diff
@@ -16,7 +16,7 @@ Index: a/src/apps/VBoxUSB_DevRules/Makefile.kmk
 ===================================================================
 --- a/src/apps/VBoxUSB_DevRules/Makefile.kmk	(revision 0)
 +++ b/src/apps/VBoxUSB_DevRules/Makefile.kmk	(working copy)
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,33 @@
 +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
 +## @file
 +#
@@ -37,9 +37,13 @@ Index: a/src/apps/VBoxUSB_DevRules/Makefile.kmk
 +
 +PROGRAMS += VBoxUSB_DevRules
 +
-+VBoxUSB_DevRules_TEMPLATE = VBOXQT4GUIEXE
++VBoxUSB_DevRules_TEMPLATE = VBOXQTGUIEXE
 +VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp
 +VBoxUSB_DevRules_QT_MODULES = Core Gui
++ifdef VBOX_WITH_QTGUI_V5
++ # Qt5 requires additional modules:
++ VBoxUSB_DevRules_QT_MODULES += Widgets
++endif # VBOX_WITH_QTGUI_V5
 +
 +#INSTALLS += VBoxUSB_DevRules
 +
@@ -51,8 +55,8 @@ Index: a/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
 --- a/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp	(revision 0)
 +++ b/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp	(working copy)
 @@ -0,0 +1,13 @@
-+#include <QtGui/QApplication>
-+#include <QtGui/QMessageBox>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
 +int main(int argc, char *argv[])
 +{
 +        QApplication app(argc, argv);
diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff
index aa54d23..5a157b5 100644
--- a/vbox-vboxadd-init-script.diff
+++ b/vbox-vboxadd-init-script.diff
@@ -1,7 +1,7 @@
-Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
 ===================================================================
---- VirtualBox-5.0.18.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-5.1.2.orig/src/VBox/Additions/linux/installer/vboxadd.sh
++++ VirtualBox-5.1.2/src/VBox/Additions/linux/installer/vboxadd.sh
 @@ -23,9 +23,12 @@
  # Provides:       vboxadd
  # Required-Start:
@@ -15,8 +15,8 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
 +# Short-Description: VirtualBox Linux Additions kernel modules
  ### END INIT INFO
  
- PATH=$PATH:/bin:/sbin:/usr/sbin
-@@ -148,7 +151,6 @@ fail()
+ ## @todo This file duplicates a lot of script with vboxdrv.sh.  When making
+@@ -100,7 +103,6 @@ fail()
  
  dev=/dev/vboxguest
  userdev=/dev/vboxuser
@@ -24,7 +24,7 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
  owner=vboxadd
  group=1
  
-@@ -226,12 +228,6 @@ do_vboxguest_non_udev()
+@@ -146,12 +148,6 @@ do_vboxguest_non_udev()
              fail "Cannot create device $dev with major $maj and minor $min"
          }
      fi
@@ -37,7 +37,7 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
  
      if [ ! -c $userdev ]; then
          maj=10
-@@ -242,12 +238,6 @@ do_vboxguest_non_udev()
+@@ -162,12 +158,6 @@ do_vboxguest_non_udev()
                  rmmod vboxguest 2>/dev/null
                  fail "Cannot create device $userdev with major $maj and minor $min"
              }
@@ -50,10 +50,10 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
          fi
      fi
  }
-@@ -255,13 +245,6 @@ do_vboxguest_non_udev()
- start()
- {
-     begin "Starting the VirtualBox Guest Additions ";
+@@ -177,13 +167,6 @@ start()
+     begin "Starting the VirtualBox Guest Additions" console;
+     # If we got this far assume that the slow set-up has been done.
+     QUICKSETUP=yes
 -    if test -r $config; then
 -      . $config
 -    else
@@ -64,28 +64,38 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
      uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
          ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
          no_udev=1
-@@ -300,7 +283,7 @@ start()
-     $MODPROBE vboxvideo > /dev/null 2>&1
+@@ -199,7 +182,7 @@ start()
+         $MODPROBE vboxguest >/dev/null 2>&1 || {
+             setup
+             $MODPROBE vboxguest >/dev/null 2>&1 || {
+-                /sbin/rcvboxadd-x11 cleanup
++                #/sbin/rcvboxadd-x11 cleanup
+                 fail "modprobe vboxguest failed"
+             }
+         }
+@@ -223,7 +206,7 @@ start()
+     }
  
      # Put the X.Org driver in place.  This is harmless if it is not needed.
 -    /sbin/rcvboxadd-x11 setup
-+#    /sbin/rcvboxadd-x11 setup
++    #/sbin/rcvboxadd-x11 setup
      # Install the guest OpenGL drivers.  For now we don't support
      # multi-architecture installations
-     rm -rf /etc/ld.so.conf.d/00vboxvideo.conf
-@@ -475,7 +458,7 @@ extra_setup()
+     rm -f /etc/ld.so.conf.d/00vboxvideo.conf
+@@ -424,7 +407,7 @@ extra_setup()
      ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
      # And an rc file to re-build the kernel modules and re-set-up the X server.
      ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
 -    ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
-+#    ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
-     # At least Fedora 11 and Fedora 12 require the correct security context when
-     # executing this command from service scripts. Shouldn't hurt for other
-     # distributions.
-@@ -497,49 +480,13 @@ extra_setup()
++    #ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
+     # And a post-installation script for rebuilding modules when a new kernel
+     # is installed.
+     mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
+@@ -457,49 +440,13 @@ EOF
  # setup_script
  setup()
  {
+-    begin "Building Guest Additions kernel modules" console
 -    if test -r $config; then
 -      . $config
 -    else
@@ -99,20 +109,22 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
 -    rm -f $LOG
 -    MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
 -    BUILDINTMP="$MODULE_SRC/build_in_tmp"
--    DODKMS="$MODULE_SRC/do_dkms"
 -    chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
--    chcon -t bin_t "$DODKMS"     > /dev/null 2>&1
 -
--    setup_modules
--    mod_succ="$?"
+-    if setup_modules; then
+-        mod_succ=0
+-    else
+-        mod_succ=1
+-        show_error "Please check that you have gcc, make, the header files for your Linux kernel and possibly perl installed."
+-    fi
+-    test -n "${QUICKSETUP}" && return "${mod_succ}"
 -    extra_setup
 -    if [ "$mod_succ" -eq "0" ]; then
 -        if running_vboxguest || running_vboxadd; then
--            printf "You should restart your guest to make sure the new modules are actually used\n\n"
--        else
--            start
+-            begin "You should restart your guest to make sure the new modules are actually used" console
 -        fi
 -    fi
+-    return "${mod_succ}"
 +    begin "Recompiling VirtualBox kernel module, NOT. It has been packaged."
 +    succ_msg
  }
@@ -124,28 +136,25 @@ Index: VirtualBox-5.0.18/src/VBox/Additions/linux/installer/vboxadd.sh
 -      . $config
 -      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
 -        fail "Configuration file $config not complete"
--      DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
--    elif test -x ./do_dkms; then  # Executing as part of the installer...
--      DODKMS=./do_dkms
 -    else
 -      fail "Configuration file $config not found"
 -    fi
 -
      # Delete old versions of VBox modules.
      cleanup_modules
-     depmod
-@@ -550,12 +497,12 @@ cleanup()
+     for i in /lib/modules/*; do
+@@ -512,12 +459,12 @@ cleanup()
      done
  
      # Clean-up X11-related bits
 -    /sbin/rcvboxadd-x11 cleanup
-+#    /sbin/rcvboxadd-x11 cleanup
++    #/sbin/rcvboxadd-x11 cleanup
  
      # Remove other files
      rm /sbin/mount.vboxsf 2>/dev/null
      rm /sbin/rcvboxadd 2>/dev/null
 -    rm /sbin/rcvboxadd-x11 2>/dev/null
-+#    rm /sbin/rcvboxadd-x11 2>/dev/null
++    #rm /sbin/rcvboxadd-x11 2>/dev/null
+     rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+     rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
      rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
- }
- 
diff --git a/vbox-vboxdrv-init-script.diff b/vbox-vboxdrv-init-script.diff
index d11614b..88b1e06 100644
--- a/vbox-vboxdrv-init-script.diff
+++ b/vbox-vboxdrv-init-script.diff
@@ -1,7 +1,7 @@
-Index: src/VBox/Installer/linux/vboxdrv.sh.in
+Index: src/VBox/Installer/linux/vboxdrv.sh
 ===================================================================
---- src/VBox/Installer/linux/vboxdrv.sh.in.orig
-+++ src/VBox/Installer/linux/vboxdrv.sh.in
+--- src/VBox/Installer/linux/vboxdrv.sh
++++ src/VBox/Installer/linux/vboxdrv.sh
 @@ -19,11 +19,12 @@
  #
  ### BEGIN INIT INFO
@@ -19,89 +19,56 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
  ### END INIT INFO
  
  PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
-@@ -191,13 +192,6 @@ start()
+@@ -275,13 +276,6 @@ start()
          fi
      fi
      # ensure permissions
--    if ! chown :%GROUP% $DEVICE 2>/dev/null; then
+-    if ! chown :"${GROUP}" $DEVICE 2>/dev/null; then
 -        rmmod vboxpci 2>/dev/null
 -        rmmod vboxnetadp 2>/dev/null
 -        rmmod vboxnetflt 2>/dev/null
 -        rmmod vboxdrv 2>/dev/null
--        failure "Cannot change group %GROUP% for device $DEVICE"
+-        failure "Cannot change group ${GROUP} for device $DEVICE"
 -    fi
      if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
          failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
      fi
-@@ -295,70 +289,8 @@ stop_vms()
+@@ -412,36 +406,8 @@ cleanup()
  # setup_script
  setup()
  {
--    stop
--    DKMS=`which dkms 2>/dev/null`
--    if [ -n "$DKMS" ]; then
--      begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
--      $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
--      succ_msg
+-    begin_msg "Building VirtualBox kernel modules" console
+-    cleanup
+-    if ! $BUILDINTMP \
+-        --save-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxdrv" \
+-        --no-print-directory install >> $LOG 2>&1; then
+-        "${INSTALL_DIR}/check_module_dependencies.sh"
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
--        begin_msg "Removing old VirtualBox pci kernel module"
--        find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
--        begin_msg "Removing old VirtualBox netadp kernel module"
--        find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
--        begin_msg "Removing old VirtualBox netflt kernel module"
--        find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
--        begin_msg "Removing old VirtualBox kernel module"
--        find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
+-    if ! $BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxnetflt" \
+-        --no-print-directory install >> $LOG 2>&1; then
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if [ -n "$DKMS" ]; then
--      begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
--      if ! $DODKMS install vboxhost $VERSION >> $LOG; then
--        fail_msg "Failed, trying without DKMS"
--        DKMS=""
--      fi
+-    if ! $BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxnetadp" \
+-        --no-print-directory install >> $LOG 2>&1; then
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if [ -z "$DKMS" ]; then
--      begin_msg "Recompiling VirtualBox kernel modules"
--      if ! $BUILDINTMP \
--          --save-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxdrv" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxnetflt" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxnetadp" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxpci" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
+-    if ! $BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxpci" \
+-        --no-print-directory install >> $LOG 2>&1; then
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
 -    rm -f /etc/vbox/module_not_compiled
+-    depmod -a
+-    succ_msg "VirtualBox kernel modules built"
 +    begin_msg "Recompiling VirtualBox kernel module, NOT. It has been packaged."
-     succ_msg
--    start
++    succ_msg ""
  }
  
  dmnstatus()
diff --git a/vbox-vboxweb-init-script.diff b/vbox-vboxweb-init-script.diff
index fd4d5df..c6abf5f 100644
--- a/vbox-vboxweb-init-script.diff
+++ b/vbox-vboxweb-init-script.diff
@@ -1,7 +1,7 @@
-Index: VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh
+Index: VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh
 ===================================================================
---- VirtualBox-4.1.8_OSE.orig/src/VBox/Installer/linux/vboxweb-service.sh
-+++ VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh
+--- VirtualBox-5.1.2.orig/src/VBox/Installer/linux/vboxweb-service.sh
++++ VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh
 @@ -20,7 +20,7 @@
  # Provides:       vboxweb-service
  # Required-Start: vboxdrv
@@ -11,12 +11,3 @@ Index: VirtualBox-4.1.8_OSE/src/VBox/Installer/linux/vboxweb-service.sh
  # Default-Stop:   0 1 6
  # Description:    VirtualBox web service API
  ### END INIT INFO
-@@ -50,7 +50,7 @@ if [ -f /etc/redhat-release ]; then
-     PIDFILE="/var/lock/subsys/vboxweb-service"
- elif [ -f /etc/SuSE-release ]; then
-     system=suse
--    PIDFILE="/var/lock/subsys/vboxweb-service"
-+    PIDFILE="/var/run/vboxweb-service"
- elif [ -f /etc/debian_version ]; then
-     system=debian
-     PIDFILE="/var/run/vboxweb-service"
diff --git a/vbox_prevent_wrong_SONAME.patch b/vbox_prevent_wrong_SONAME.patch
index a31b20b..0fea800 100644
--- a/vbox_prevent_wrong_SONAME.patch
+++ b/vbox_prevent_wrong_SONAME.patch
@@ -1,8 +1,8 @@
-Index: VirtualBox-5.0.17/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
 ===================================================================
---- VirtualBox-5.0.17.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ VirtualBox-5.0.17/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -227,7 +227,7 @@ if1of ($(KBUILD_TARGET), linux solaris f
+--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
++++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+@@ -221,7 +221,7 @@ if1of ($(KBUILD_TARGET), linux solaris f
    	dl
    endif
   else
diff --git a/virtualbox-sed-params.patch b/virtualbox-sed-params.patch
index 18615f6..6e28a27 100644
--- a/virtualbox-sed-params.patch
+++ b/virtualbox-sed-params.patch
@@ -1,7 +1,8 @@
-diff -urN VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk
---- VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk	2015-07-11 13:17:27.573698915 +0200
-+++ VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk	2015-07-11 14:34:21.357349819 +0200
-@@ -1199,7 +1199,7 @@
+Index: VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Main/Makefile.kmk
++++ VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk
+@@ -1331,7 +1331,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
  	$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
  		--stringparam generating "dtrace-probes" \
  		-o "$@" $(VBoxAPIWrap_VBOX_XSLT) $<
diff --git a/virtualbox-system-x.patch b/virtualbox-system-x.patch
index 7c4cf93..38861ae 100644
--- a/virtualbox-system-x.patch
+++ b/virtualbox-system-x.patch
@@ -1,7 +1,8 @@
-diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2015-07-11 13:17:27.581698930 +0200
-+++ VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2015-07-11 13:19:09.146886862 +0200
-@@ -67,18 +67,12 @@
+Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
++++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUES
  VBoxOGL_INCS           = .
  if1of ($(KBUILD_TARGET), linux solaris freebsd)
   VBoxOGL_INCS     += \
@@ -25,7 +26,7 @@ diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk V
   VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
  endif
  
-@@ -213,10 +207,10 @@
+@@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \
  
  if1of ($(KBUILD_TARGET), linux solaris freebsd)
   VBoxOGL_LIBS += \
@@ -40,10 +41,11 @@ diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk V
   ifdef VBoxOGL_FAKEDRI
    ifeq ($(KBUILD_TARGET), freebsd)
      VBoxOGL_LIBS += \
-diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2015-07-11 13:17:27.580698928 +0200
-+++ VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2015-07-11 13:19:09.146886862 +0200
-@@ -40,8 +40,6 @@
+Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+===================================================================
+--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
++++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+@@ -40,8 +40,6 @@ LIBRARIES += \
  	VBoxGuestR3LibShared
  ifndef VBOX_ONLY_VALIDATIONKIT
   if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
diff --git a/virtualbox.changes b/virtualbox.changes
index 439a641..7ef0ac5 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Jul 22 00:49:00 UTC 2016 - luizluca@tre-sc.jus.br
+
+- Version bump to 5.1.2 (released 2016-07-21 by Oracle)
+
+New main capabilities in Oracle VM VirtualBox 5.1 are:
+
+  Improved Performance: Significantly improved performance for multi-CPU virtual machines and networking.
+  Bug Reporting Tool: New utility able to collect all the information and logs related to the host and guest operating system, for debug or analysis purposes.
+  Improved Logging Window: New logging functionalities to highlight and filter information related to guest Virtual Machines.
+  Improved multimedia availability: Improved support for different USB devices and multi-channel audio availability.
+  Flash storage emulation: New NVMHCI storage controller emulation available, able to emulate NVME devices - Flash storage - on guest Virtual Machine.
+  Improved Linux integration: Automatic modules deployment in case of a Linux Kernel upgrade and improved systemd integration for the latest releases of popular Linux distributions.
+
+- Drop drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch, fixed upstream.
+- Drop drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch, fixed upstream.
+- Drop vbox-4.7.patch, fixed upstream.
+- vbox-permissions_warning.diff and vbox-usb-warning.diff updated to Qt5
+- User Manual updated.
+
 -------------------------------------------------------------------
 Thu Jul 21 19:18:39 UTC 2016 - adam@mizerski.pl
 
diff --git a/virtualbox.spec b/virtualbox.spec
index f70631f..9402fca 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -19,7 +19,7 @@
 %define _vbox_instdir  %{_libexecdir}/virtualbox
 %define _udevrulesdir %{_libexecdir}/udev/rules.d
 Name:           virtualbox
-Version:        5.0.18
+Version:        5.1.2
 Release:        0
 Summary:        VirtualBox is an Emulator
 License:        GPL-2.0+
@@ -87,11 +87,6 @@ Patch109:       vbox-usb-warning.diff
 Patch111:       vbox_prevent_wrong_SONAME.patch
 # Apply Changeset 60565 - Fix bug in DevLsiLogicSCSI.cpp
 Patch112:       changeset_60565.diff
-# Patch to make xf86-video-fbdev work on vboxvideodrm
-Patch114:       drm-vboxvideo-Initialize-data-needed-to-map-fbdev-memory.patch
-Patch113:       drm-vboxvideo-Add-delayed-update-to-support-fbdev.patch
-# Patch to allow 5.0.18 to build on kernel 4.7
-Patch115:       vbox-4.7.patch
 #
 BuildRequires:  LibVNCServer-devel
 BuildRequires:  SDL-devel
@@ -109,13 +104,15 @@ BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel-static
 BuildRequires:  gsoap-devel
 BuildRequires:  java-devel >= 1.6.0
-BuildRequires:  kbuild >= 0.1.9998svn2689
+BuildRequires:  kbuild >= 0.1.9998svn2808
 BuildRequires:  kernel-syms
 BuildRequires:  libcap-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libopenssl-devel
-BuildRequires:  libqt4-devel
+BuildRequires:  libqt5-linguist
+BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libvpx-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  module-init-tools
@@ -132,6 +129,7 @@ BuildRequires:  xorg-x11-server-sdk
 BuildRequires:  yasm
 BuildRequires:  zlib-devel-static
 BuildRequires:  pkgconfig(fontsproto)
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(randrproto)
 BuildRequires:  pkgconfig(renderproto)
 BuildRequires:  pkgconfig(resourceproto)
@@ -140,13 +138,17 @@ BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
 BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xdmcp)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xextproto)
 BuildRequires:  pkgconfig(xf86driproto)
 BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xineramaproto)
+BuildRequires:  pkgconfig(xmu)
 BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(xrandr)
 Requires:       %{name}-host-kmp = %{version}
 Requires(post): sysvinit(syslog)
 Requires(pre):  permissions
@@ -323,9 +325,7 @@ This package contains icons for guest desktop files that were created on the des
 %patch109 -p1
 %patch111 -p1
 %patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
+
 #copy user manual
 cp %{SOURCE1} UserManual.pdf
 #copy kbuild config
@@ -355,7 +355,6 @@ echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed"  >> LocalConfig.kmk
 rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
 
 #	--disable-kmods		don't build Linux kernel modules -  but use SUSE specific way see few lines under
-#	--nofatal		try to avoid build fail caused by missing makeself package
 # NOT an autoconf configure macro
 ./configure \
     --ose \
@@ -365,8 +364,9 @@ rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
     --with-linux="/usr" \
     --disable-java \
     --disable-docs \
-    --nofatal \
-    --enable-webservice
+    --enable-webservice \
+    --with-mkisofs=/bin/true \
+    --with-makeself=/bin/true
 
 # configure actually warns we should source env.sh (which seems like it could influence the build...)
 source ./env.sh
@@ -481,7 +481,7 @@ ln -s %{_sysconfdir}/init.d/vboxadd-service %{buildroot}%{_sbindir}/rcvboxadd-se
 install -m 644 %{SOURCE3}			%{buildroot}%{_udevrulesdir}/60-vboxguest.rules
 # /media is used for auto-mounting of shared folders
 %if 0%{?suse_version} > 1310
-install -d 755 %{buildroot}/media
+install -d -m 755 %{buildroot}/media
 %endif
 #
 ##############################################################
@@ -559,8 +559,8 @@ install -m 644 %{SOURCE9}			%{buildroot}%{_bindir}/VirtualBox
 # modify and install the vboxdrv init script
 # TODO: some of this stuff breaks the fillup macros below?
 sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" \
-						src/VBox/Installer/linux/vboxdrv.sh.in
-install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in %{buildroot}%{_sysconfdir}/init.d/vboxdrv
+						src/VBox/Installer/linux/vboxdrv.sh
+install -m 744 src/VBox/Installer/linux/vboxdrv.sh %{buildroot}%{_sysconfdir}/init.d/vboxdrv
 ln -s %{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sbindir}/rcvboxdrv
 # Init script to start virtual boxes during boot
 install -m 755 %{SOURCE12} %{buildroot}%{_sysconfdir}/init.d/vboxes