diff --git a/virtualbox.spec b/virtualbox.spec
index 1d4f31a..d475de6 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -16,7 +16,6 @@
 #
 
 
-%(sed -e '/^Provides: multiversion(kernel)/d' /usr/lib/rpm/kernel-module-subpackage > %_builddir/virtualbox-kmp-template)
 %define _vbox_instdir  %{_libexecdir}/virtualbox
 %define _udevrulesdir %{_libexecdir}/udev/rules.d
 Name:           virtualbox
@@ -51,13 +50,13 @@ Source99:       %{name}-patch-source.sh
 Patch1:         vbox-vboxdrv-init-script.diff
 Patch2:         vbox-vboxadd-init-script.diff
 Patch3:         vbox-vboxweb-init-script.diff
+#PATCH-FIX-OPENSUSE: Use system X libraries and do not build local things
+Patch4:         virtualbox-system-x.patch
 #fix build : "Error 4001 - String must be entirely alphanumeric"
 #with renaming we probably break some macosx functionality however ths is just quick fix
 #file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds
 #see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
 Patch6:         vbox-smc-napa.diff
-#PATCH-FIX-OPENSUSE: Use system X libraries and do not build local things
-Patch4:         virtualbox-system-x.patch
 #fix build of Python and dev package on openSUSE 11.3
 Patch8:         vbox-python-detection.diff
 #deprecated old-style C++ service proxies and objects,we have to use soapcpp2 -z1 flag
@@ -143,6 +142,7 @@ Recommends:     %{name}-gui = %{version}
 Provides:       %{name}-ose = %{version}
 Obsoletes:      %{name}-ose < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template)
 ExclusiveArch:  %ix86 x86_64
 %ifarch amd64 x86_64 ia32e em64t
 BuildRequires:  gcc-32bit
@@ -191,7 +191,7 @@ websrv GUI part for %{name}.
 Summary:        Host kernel module for VirtualBox
 Group:          System/Emulators/PC
 # SUSE specify macro to define host kmp package
-%{?suse_kernel_module_package:%suse_kernel_module_package -t %_builddir/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} kdump um xen xenpae}
+%{?suse_kernel_module_package:%suse_kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} kdump um xen xenpae}
 
 %description host-KMP
 This package contains the kernel-module for VirtualBox.
@@ -201,7 +201,7 @@ This package contains the kernel-module for VirtualBox.
 Summary:        Guest kernel modules for VirtualBox
 Group:          System/Emulators/PC
 #SUSE specify macro to define guest kmp package
-%{?suse_kernel_module_package:%suse_kernel_module_package -t %_builddir/virtualbox-kmp-template -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} kdump um xen xenpae}
+%{?suse_kernel_module_package:%suse_kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} kdump um xen xenpae}
 
 %description guest-KMP
 This package contains the kernel-module for VirtualBox.
@@ -263,14 +263,14 @@ Development file for %{name}
 Summary:        Source files for %{name} kernel modules
 Group:          Development/Sources
 Requires:       %{name} = %{version}
-BuildArch:      noarch
 Requires:       gcc
 Requires:       make
+BuildArch:      noarch
 
 %description host-source
 Source files for %{name} kernel modules
 These can be built for custom kernels using
-cd /usr/src/kernel-modules/virtualbox ; make ; make install
+cd %{_prefix}/src/kernel-modules/virtualbox ; make ; make install
 ###########################################
 
 %package guest-desktop-icons