Index: /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh	(revision 44092)
+++ /trunk/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh	(revision 44093)
@@ -290,11 +290,10 @@
 
 if [ -n "${do_install}" ]; then
-  cd "${SCRIPT_FOLDER}"
-  SCRIPT_FOLDER=$(pwd)"/"
+  SCRIPT_FOLDER=$(cd "${SCRIPT_FOLDER}" && pwd)"/"
   CONFIGURATION_FILE_ESCAPED=$(echo "${CONFIGURATION_FILE}" | sed 's/\([ \%]\)/\\\1/g')
   if [ "x${do_install}" = "xinstall" ]; then
-    ../helpers/install_service --command "${SCRIPT_FOLDER}"$(basename "${SCRIPT_NAME}") --arguments "--conf-file ${CONFIGURATION_FILE_ESCAPED}" --service-name "${SERVICE_NAME}" --description "${SERVICE_DESCRIPTION}" --enable
+    ${SCRIPT_FOLDER}install_service --command "${SCRIPT_FOLDER}"$(basename "${SCRIPT_NAME}") --arguments "--conf-file ${CONFIGURATION_FILE_ESCAPED}" --service-name "${SERVICE_NAME}" --description "${SERVICE_DESCRIPTION}" --enable
   else
-    ../helpers/install_service --service-name "${SERVICE_NAME}" --remove
+    ${SCRIPT_FOLDER}install_service --service-name "${SERVICE_NAME}" --remove
   fi
   exit 0