Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 44091)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 44092)
@@ -170,5 +170,6 @@
 		ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
 		ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
-	VBoxTunctl
+	VBoxTunctl \
+	helpers/generate_service_file
 
 # Do not remove relocation information of these binaries
@@ -201,5 +202,4 @@
 	VBox.sh \
 	VBox.png \
-	helpers \
 	scripts
 
@@ -398,5 +398,6 @@
 	$(wildcard $(PATH_STAGE_BIN)/src/*/*) \
 	$(wildcard $(PATH_STAGE_BIN)/src/*/*/*) \
-	$(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*)
+	$(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*) \
+	$(wildcard $(PATH_STAGE_BIN)/scripts/*)
 
 
@@ -478,4 +479,5 @@
 	archive \
 	archive/components \
+	archive/helpers \
 	archive/nls \
 	$(if $(VBOX_WITH_QT4_SUN),archive/accessible,) \
@@ -524,4 +526,5 @@
 	$(VBOX_LNX_DBG_PATH) \
 	$(VBOX_LNX_DBG_PATH)/components \
+	$(VBOX_LNX_DBG_PATH)/helpers \
 ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/)
 
Index: /trunk/src/VBox/Installer/linux/install_service/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/install_service/Makefile.kmk	(revision 44091)
+++ /trunk/src/VBox/Installer/linux/install_service/Makefile.kmk	(revision 44092)
@@ -35,5 +35,5 @@
 
 INSTALLS.linux += linux-install-service-bin
-linux-install-service-bin_INST =    bin/helpers/
+linux-install-service-bin_INST =    bin/scripts/
 linux-install-service-bin_MODE =    a+rx,u+w
 linux-install-service-bin_SOURCES = \
@@ -41,5 +41,5 @@
 
 INSTALLS.linux += linux-install-service-nobin
-linux-install-service-nobin_INST =    bin/helpers/
+linux-install-service-nobin_INST =    bin/scripts/
 linux-install-service-nobin_MODE =    a+r,u+w
 linux-install-service-nobin_SOURCES = \
Index: /trunk/src/VBox/Installer/linux/install_service/install_service.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/install_service/install_service.sh	(revision 44091)
+++ /trunk/src/VBox/Installer/linux/install_service/install_service.sh	(revision 44092)
@@ -80,5 +80,5 @@
 
 EOF
-    "${script_folder}/generate_service_file" --list-options
+    "${script_folder}/../helpers/generate_service_file" --list-options
 }
 
@@ -186,5 +186,5 @@
         test -f "${path}/${SERVICE_NAME}" && update="${UPDATE}"
         if test -n "${INSTALL}"; then
-            "${script_folder}/generate_service_file" --format shell --command "${COMMAND}" --arguments "${ARGUMENTS}" --description "${DESCRIPTION}" --service-name "${SERVICE_NAME}" < "${script_folder}/init_template.sh" > "${path}/${SERVICE_NAME}"
+            "${script_folder}/../helpers/generate_service_file" --format shell --command "${COMMAND}" --arguments "${ARGUMENTS}" --description "${DESCRIPTION}" --service-name "${SERVICE_NAME}" < "${script_folder}/init_template.sh" > "${path}/${SERVICE_NAME}"
             chmod a+x "${path}/${SERVICE_NAME}"
         else