diff --git a/vboxdrv.sh b/vboxdrv.sh
index ae89fdd..928b181 100644
--- a/vboxdrv.sh
+++ b/vboxdrv.sh
@@ -52,20 +52,6 @@ export BUILD_TYPE
 export USERNAME
 export USER=$USERNAME
 
-if test -n "${INSTALL_DIR}" && test -x "${INSTALL_DIR}/VirtualBox"; then
-    MODULE_SRC="${INSTALL_DIR}/src/vboxhost"
-elif test -x /usr/lib/virtualbox/VirtualBox; then
-    INSTALL_DIR=/usr/lib/virtualbox
-    MODULE_SRC="/usr/share/virtualbox/src/vboxhost"
-elif test -x "${SCRIPT_DIR}/VirtualBox"; then
-    # Executing from the build directory
-    INSTALL_DIR="${SCRIPT_DIR}"
-    MODULE_SRC="${INSTALL_DIR}/src"
-else
-    # Silently exit if the package was uninstalled but not purged.
-    # Applies to Debian packages only (but shouldn't hurt elsewhere)
-    exit 0
-fi
 VIRTUALBOX="${INSTALL_DIR}/VirtualBox"
 VBOXMANAGE="${INSTALL_DIR}/VBoxManage"
 BUILDINTMP="${MODULE_SRC}/build_in_tmp"
diff --git a/virtualbox.changes b/virtualbox.changes
index 93cedde..28125be 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 25 20:15:56 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Make changes suggested in bsc#1060072
+  The specific changes are:
+  (1) Remove the test in vboxdrv.sh as the script tests for the wrong file. This is safe because
+      if the package is not installed, the script will not be there.
+  (2) Move VBoxDbg.so to package virtualbox-qt. With this change, packages libQt5Core, libQt5Gui
+      and libQt5Widgets are no longer needed with package virtualbox. As a result, a text-only
+      server no longer needs to load QT to support headless virtual machines.
+
 -------------------------------------------------------------------
 Sun Sep 24 14:45:02 UTC 2017 - Larry.Finger@lwfinger.net
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 40f0288..4f13b61 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -593,6 +593,7 @@ install -m 755 vboxshell.py			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxBalloonCtrl			%{buildroot}%{_vbox_instdir}
 install -m 755 webtest				%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxDTrace			%{buildroot}%{_vbox_instdir}
+install -m 755 VBoxDbg.so			%{buildroot}%{_vbox_instdir}
 # create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
 ln -s %{_vbox_instdir}/VBoxManage		%{buildroot}%{_bindir}/VBoxManage
 ln -s %{_vbox_instdir}/VBoxHeadless 		%{buildroot}%{_bindir}/VBoxHeadless
@@ -864,7 +865,6 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_vbox_instdir}/DbgPlugInDiggers.so
 %{_vbox_instdir}/VBoxAuth.so
 %{_vbox_instdir}/VBoxAuthSimple.so
-%{_vbox_instdir}/VBoxDbg.so
 %{_vbox_instdir}/VBoxDragAndDropSvc.so
 %{_vbox_instdir}/VBoxVMMPreload.so
 #todo:double check - if this file should be assigned to the host side
@@ -910,6 +910,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 #qm's translations
 %{_datadir}/virtualbox/nls
 %{_vbox_instdir}/VirtualBox.so
+%{_vbox_instdir}/VBoxDbg.so
 %{_datadir}/pixmaps/virtualbox.png
 %{_datadir}/applications/%{name}.desktop
 %{_udevrulesdir}/60-vboxdrv.rules