diff --git a/vboxconfig.sh b/vboxconfig.sh
index 595af6f..1cd5d4c 100644
--- a/vboxconfig.sh
+++ b/vboxconfig.sh
@@ -5,7 +5,7 @@
 #
 # This script is part of the openSUSE VirtualBox package
 #
-SOURCE="/usr/src/kernel-modules/virtualbox"
+SOURCE="/usr/src/kernel-modules/virtualbox/src"
 LOGFILE="/var/log/virtualbox.log"
 INCLUDE="/lib/modules/`uname -r`/build/include"
 
diff --git a/vboxguestconfig.sh b/vboxguestconfig.sh
index 9944d62..ba789c3 100644
--- a/vboxguestconfig.sh
+++ b/vboxguestconfig.sh
@@ -5,7 +5,7 @@
 #
 # This script is part of the openSUSE VirtualBox package
 #
-SOURCE="/usr/src/kernel-modules/virtualbox"
+SOURCE="/usr/src/kernel-modules"
 LOGFILE="/var/log/virtualbox.log"
 INCLUDE="/lib/modules/`uname -r`/build/include"
 
@@ -21,7 +21,7 @@ fi
 # Prerequisites are available, start build
 pushd $SOURCE > /dev/null 2>&1
 echo "Building kernel modules..."
-tar jxf guest_src.tar.bz2 > /dev/null 2>&1
+tar jxf additions/guest_src.tar.bz2 > /dev/null 2>&1
 cd additions/src
 make > $LOGFILE 2>&1
 if [ ! $? ] ; then
@@ -44,7 +44,7 @@ fi
 depmod -a
 modprobe -av vboxguest vboxvideo vboxsf
 cd ../..
-rm -rf additions
+rm -rf additions/src
 popd > /dev/null 2>&1
 echo "Kernel modules are installed and loaded."
 exit 0
diff --git a/virtualbox.changes b/virtualbox.changes
index 7c2528a..a74fa5d 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jun 25 00:20:08 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Fix some typos in the various service files as noted in boo#1044931.
+  With these fixes, TW guests start correctly. In addition, the /sbin/vboxconfig (for hosts) and the
+  /sbin/vboxguestconfig (for guests) work correctly.
+
 -------------------------------------------------------------------
 Wed Jun 21 16:46:48 UTC 2017 - Larry.Finger@lwfinger.net
 
diff --git a/virtualbox.spec b/virtualbox.spec
index fbf5cf1..72ea665 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -175,7 +175,7 @@ BuildRequires:  pkgconfig(xrandr)
 Requires:       %{name}-host-kmp = %{version}
 Requires(post): sysvinit(syslog)
 Requires(pre):  permissions
-%if 0%{?suse_version} > 1320 
+%if ! 0%{?suse_version} > 1325
 Requires(pre):  net-tools-deprecated
 %endif
 Requires(pre):  pwdutils
@@ -635,15 +635,15 @@ install -m 744 src/VBox/Installer/linux/vboxdrv.sh %{buildroot}%{_sysconfdir}/in
 ln -s %{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sbindir}/rcvboxdrv
 # Service files to load kernel modules on boot
 install -m 0644 %{SOURCE14}			%{buildroot}%{_unitdir}/vboxdrv.service
-install -m 0644 %{SOURCE14}			%{buildroot}%{_unitdir}/multi-user.target.wants/vboxdrv.service
 install -m 0644 %{SOURCE15}			%{buildroot}%{_unitdir}/vboxadd-service.service
-install -m 0644 %{SOURCE15}			%{buildroot}%{_unitdir}/multi-user.target.wants/vboxadd-service.service
-install -m 0644 %{SOURCE16}			%{buildroot}/sbin/vboxconfig
-install -m 0644 %{SOURCE17}			%{buildroot}/sbin/vboxguestconfig
+install -m 0755 %{SOURCE16}			%{buildroot}/sbin/vboxconfig
+install -m 0755 %{SOURCE17}			%{buildroot}/sbin/vboxguestconfig
 install -m 0755 %{SOURCE18}			%{buildroot}/sbin/vbox-fix-usb-rules.sh
 # Init script to start virtual boxes during boot
 install -m 755 %{SOURCE12} %{buildroot}%{_sysconfdir}/init.d/vboxes
 ln -s %{_sysconfdir}/init.d/vboxes %{buildroot}%{_sbindir}/rcvboxes
+ln -sf %{_unitdir}/vboxdrv.service		%{buildroot}%{_unitdir}/multi-user.target.wants/vboxdrv.service
+ln -sf %{_unitdir}/vboxadd-service.service	%{buildroot}%{_unitdir}/multi-user.target.wants/vboxadd-service.service
 # sysconfig file intended for vboxes script
 install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
 install -m 640 %{SOURCE13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox