diff --git a/build/jam/images/Haiku64Image b/build/jam/images/Haiku64Image
index 7c12aa501c..737b27f259 100644
--- a/build/jam/images/Haiku64Image
+++ b/build/jam/images/Haiku64Image
@@ -445,156 +445,4 @@ CopyDirectoryToHaikuImage system documentation
 	: diskusage : -x .svn ;
 
 
-#pragma mark - Optional Packages
-
-
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
-
-
-#pragma mark - User/Group Setup
-
-
-# add the root user and the root and users groups
-AddUserToHaikuImage $(HAIKU_ROOT_USER_NAME:E=baron) : 0 : 0 : /boot/home
-	: /bin/bash : $(HAIKU_ROOT_USER_REAL_NAME:E="Root User") ;
-AddGroupToHaikuImage root : 0 : ;
-AddGroupToHaikuImage users : 100 : ;
-
-
-#pragma mark - Host Name
-
-
-if $(HAIKU_IMAGE_HOST_NAME) {
-	actions BuildHaikuImageHostnameFile
-	{
-		echo "$(HAIKU_IMAGE_HOST_NAME)" > $(1)
-	}
-
-	local file = <haiku-image>hostname ;
-	Always $(file) ;
-	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
-	BuildHaikuImageHostnameFile $(file) ;
-	AddFilesToHaikuImage common settings network : $(file) ;
-}
-
-
-#pragma mark - Build The Image
-
-
-# Execute pre-image user config rules.
-UserBuildConfigRulePreImage	;
-
-# Set image name and directory defaults and locate the image.
-HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
-HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ;
-HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ;
-HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 300 MB
-HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ;
-MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
-
-# Set the default installation directory.
-HAIKU_INSTALL_DIR ?= $(HAIKU_DEFAULT_INSTALL_DIR) ;
-
-# the pseudo target all image contents is attached to
-NotFile $(HAIKU_IMAGE_CONTAINER_NAME) ;
-
-# prepare the script that initializes the shell variables
-HAIKU_IMAGE_INIT_VARIABLES_SCRIPT = <HaikuImage>haiku.image-init-vars ;
-local script = $(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT) ;
-MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ;
-Always $(script) ;
-
-AddVariableToScript $(script) : sourceDir : $(HAIKU_TOP) ;
-AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
-AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
-AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
-#AddVariableToScript $(script) : isImage : 1 ;
-AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
-AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
-AddVariableToScript $(script) : addBuildCompatibilityLibDir
-	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
-AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
-AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
-AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
-	: $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
-AddTargetVariableToScript $(script) : <build>addattr ;
-AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
-AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ;
-AddTargetVariableToScript $(script) : <build>copyattr ;
-AddTargetVariableToScript $(script) : <build>create_image : createImage ;
-AddTargetVariableToScript $(script) : <build>makebootable ;
-AddTargetVariableToScript $(script) : <build>rc ;
-AddTargetVariableToScript $(script) : <build>resattr ;
-AddTargetVariableToScript $(script) : <build>unzip ;
-AddTargetVariableToScript $(script) : <build>vmdkimage ;
-AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
-if $(HOST_RM_ATTRS_TARGET) {
-	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
-} else {
-	AddVariableToScript $(script) : rmAttrs : rm ;
-}
-
-
-# create the other scripts
-HAIKU_IMAGE_MAKE_DIRS_SCRIPT = <HaikuImage>haiku.image-make-dirs ;
-HAIKU_IMAGE_COPY_FILES_SCRIPT = <HaikuImage>haiku.image-copy-files ;
-HAIKU_IMAGE_EXTRACT_FILES_SCRIPT = <HaikuImage>haiku.image-extract-files ;
-MakeLocate $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) $(HAIKU_IMAGE_COPY_FILES_SCRIPT)
-	$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ;
-
-CreateHaikuImageMakeDirectoriesScript $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) ;
-CreateHaikuImageCopyFilesScript $(HAIKU_IMAGE_COPY_FILES_SCRIPT) ;
-CreateHaikuImageExtractFilesScript $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) ;
-
-# Convenience wrapper rule around BuildHaikuImage.
-rule _BuildHaikuImage image : isImage : isVMwareImage
-{
-	# _BuildHaikuImage <image target> : <isImage> : <isVMwareImage> ;
-	#
-
-	# build the image
-	# HAIKU_IMAGE_EARLY_USER_SCRIPTS, HAIKU_IMAGE_LATE_USER_SCRIPTS can be
-	# specified by the user.
-	BuildHaikuImage $(image) :
-		$(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT)
-		$(HAIKU_IMAGE_EARLY_USER_SCRIPTS)
-		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
-		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
-		$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT)
-		$(HAIKU_IMAGE_LATE_USER_SCRIPTS)
-		: $(isImage)
-		: $(isVMwareImage)
-	;
-
-	# remove the scripts we have generated
-	RmTemps $(image) :
-		$(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT)
-		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
-		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
-		$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT)
-	;
-}
-
-# build the image
-_BuildHaikuImage $(HAIKU_IMAGE) : true ;
-NotFile haiku-image ;
-Depends haiku-image : $(HAIKU_IMAGE) ;
-
-
-# install Haiku into a directory
-NotFile install-haiku ;
-_BuildHaikuImage install-haiku : 0 ;
-
-
-# build the VMware image
-HAIKU_VMWARE_IMAGE_NAME ?= $(HAIKU_DEFAULT_VMWARE_IMAGE_NAME) ;
-HAIKU_VMWARE_IMAGE = $(HAIKU_VMWARE_IMAGE_NAME) ;
-MakeLocate $(HAIKU_VMWARE_IMAGE) : $(HAIKU_IMAGE_DIR) ;
-
-_BuildHaikuImage $(HAIKU_VMWARE_IMAGE) : true : true ;
-NotFile haiku-vmware-image ;
-Depends haiku-vmware-image : $(HAIKU_VMWARE_IMAGE) ;
-
-# Execute post-image user config rules.
-UserBuildConfigRulePostImage ;
+include HaikuImageCommon ;
diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index f01dc13c7c..d2850e2efc 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -317,202 +317,4 @@ for repository in $(HAIKU_REPOSITORIES) {
 }
 
 
-#pragma mark - Optional Packages
-
-
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
-
-
-#pragma mark - User/Group Setup
-
-
-# add the root user and the root and users groups
-AddUserToHaikuImage $(HAIKU_ROOT_USER_NAME:E=baron) : 0 : 0 : /boot/home
-	: /bin/bash : $(HAIKU_ROOT_USER_REAL_NAME:E="Root User") ;
-AddGroupToHaikuImage root : 0 : ;
-AddGroupToHaikuImage users : 100 : ;
-
-
-#pragma mark - Host Name
-
-
-if $(HAIKU_IMAGE_HOST_NAME) {
-	actions BuildHaikuImageHostnameFile
-	{
-		echo "$(HAIKU_IMAGE_HOST_NAME)" > $(1)
-	}
-
-	local file = <haiku-image>hostname ;
-	Always $(file) ;
-	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
-	BuildHaikuImageHostnameFile $(file) ;
-	AddFilesToHaikuImage common settings network : $(file) ;
-}
-
-
-#pragma mark - Build The Image
-
-
-# Execute pre-image user config rules.
-UserBuildConfigRulePreImage	;
-
-# Set image name and directory defaults and locate the image.
-HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
-HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ;
-HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ;
-HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 300 MB
-HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ;
-MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
-
-# Set the default installation directory.
-HAIKU_INSTALL_DIR ?= $(HAIKU_DEFAULT_INSTALL_DIR) ;
-
-# the pseudo target all image contents is attached to
-NotFile $(HAIKU_IMAGE_CONTAINER_NAME) ;
-
-# prepare the script that initializes the shell variables
-HAIKU_IMAGE_INIT_VARIABLES_SCRIPT = <HaikuImage>haiku.image-init-vars ;
-local script = $(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT) ;
-MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ;
-Always $(script) ;
-
-AddVariableToScript $(script) : sourceDir : $(HAIKU_TOP) ;
-AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
-AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
-AddVariableToScript $(script) : downloadDir : $(HAIKU_DOWNLOAD_DIR) ;
-AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
-#AddVariableToScript $(script) : isImage : 1 ;
-AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
-AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
-AddVariableToScript $(script) : addBuildCompatibilityLibDir
-	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
-AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
-AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
-AddTargetVariableToScript $(script) : <build>addattr ;
-AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
-AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ;
-AddTargetVariableToScript $(script) : <build>copyattr ;
-AddTargetVariableToScript $(script) : <build>create_image : createImage ;
-AddTargetVariableToScript $(script) : <build>makebootable ;
-AddTargetVariableToScript $(script) : <build>package ;
-AddTargetVariableToScript $(script) : <build>rc ;
-AddTargetVariableToScript $(script) : <build>resattr ;
-AddTargetVariableToScript $(script) : <build>get_package_dependencies
-	: getPackageDependencies ;
-AddTargetVariableToScript $(script) : <build>unzip ;
-AddTargetVariableToScript $(script) : <build>vmdkimage ;
-AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
-if $(HOST_RM_ATTRS_TARGET) {
-	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
-} else {
-	AddVariableToScript $(script) : rmAttrs : rm ;
-}
-
-# Add a variable to indicate whether packages dependencies shall be resolved. We
-# always want to do that in non-update mode, but also in update mode when all
-# packages are updated.
-local resolvePackageDependencies ;
-if ! [ IsUpdateHaikuImageOnly ] || $(HAIKU_UPDATE_ALL_PACKAGES) {
-	resolvePackageDependencies = 1 ;
-}
-AddVariableToScript $(script) : resolvePackageDependencies
-	: $(resolvePackageDependencies) ;
-
-# Add variables "systemPackages" and "commonPackages" with the packages
-# copied/updated.
-local container = $(HAIKU_IMAGE_CONTAINER_NAME) ;
-local allPackages = [ on $(container) return $(HAIKU_PACKAGES_IN_IMAGE) ] ;
-if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
-	&& ! [ IncludeAllTargetsInContainer $(container) ] {
-	allPackages = [ FilterContainerUpdateTargets $(allPackages)
-		: HAIKU_INCLUDE_IN_IMAGE ] ;
-}
-
-local systemPackages ;
-local commonPackages ;
-local package ;
-for package in $(allPackages) {
-	if [ on $(package) return $(HAIKU_PACKAGE_INSTALLATION_LOCATION) ]
-			= system {
-		systemPackages += $(package) ;
-	} else {
-		commonPackages += $(package) ;
-	}
-}
-
-AddTargetVariableToScript $(script) : $(systemPackages) : systemPackages ;
-AddTargetVariableToScript $(script) : $(commonPackages) : commonPackages ;
-
-# Generate the repository package lists and add variables for the repositories.
-local repository ;
-local repositoryFiles ;
-for repository in $(HAIKU_REPOSITORIES) {
-	repositoryFiles
-		+= [ on $(repository) return $(HAIKU_REPOSITORY_CACHE_FILE) ] ;
-}
-
-AddTargetVariableToScript $(script) : $(repositoryFiles) : repositories ;
-
-# create the other scripts
-HAIKU_IMAGE_MAKE_DIRS_SCRIPT = <HaikuImage>haiku.image-make-dirs ;
-HAIKU_IMAGE_COPY_FILES_SCRIPT = <HaikuImage>haiku.image-copy-files ;
-HAIKU_IMAGE_EXTRACT_FILES_SCRIPT = <HaikuImage>haiku.image-extract-files ;
-MakeLocate $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) $(HAIKU_IMAGE_COPY_FILES_SCRIPT)
-	$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ;
-
-CreateHaikuImageMakeDirectoriesScript $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) ;
-CreateHaikuImageCopyFilesScript $(HAIKU_IMAGE_COPY_FILES_SCRIPT) ;
-CreateHaikuImageExtractFilesScript $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) ;
-
-# Convenience wrapper rule around BuildHaikuImage.
-rule _BuildHaikuImage image : isImage : isVMwareImage
-{
-	# _BuildHaikuImage <image target> : <isImage> : <isVMwareImage> ;
-	#
-
-	# build the image
-	# HAIKU_IMAGE_EARLY_USER_SCRIPTS, HAIKU_IMAGE_LATE_USER_SCRIPTS can be
-	# specified by the user.
-	BuildHaikuImage $(image) :
-		$(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT)
-		$(HAIKU_IMAGE_EARLY_USER_SCRIPTS)
-		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
-		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
-		$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT)
-		$(HAIKU_IMAGE_LATE_USER_SCRIPTS)
-		: $(isImage)
-		: $(isVMwareImage)
-	;
-
-	# remove the scripts we have generated
-	RmTemps $(image) :
-		$(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT)
-		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
-		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
-		$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT)
-	;
-}
-
-# build the image
-_BuildHaikuImage $(HAIKU_IMAGE) : true ;
-NotFile haiku-image ;
-Depends haiku-image : $(HAIKU_IMAGE) ;
-
-
-# install Haiku into a directory
-NotFile install-haiku ;
-_BuildHaikuImage install-haiku : 0 ;
-
-
-# build the VMware image
-HAIKU_VMWARE_IMAGE_NAME ?= $(HAIKU_DEFAULT_VMWARE_IMAGE_NAME) ;
-HAIKU_VMWARE_IMAGE = $(HAIKU_VMWARE_IMAGE_NAME) ;
-MakeLocate $(HAIKU_VMWARE_IMAGE) : $(HAIKU_IMAGE_DIR) ;
-
-_BuildHaikuImage $(HAIKU_VMWARE_IMAGE) : true : true ;
-NotFile haiku-vmware-image ;
-Depends haiku-vmware-image : $(HAIKU_VMWARE_IMAGE) ;
-
-# Execute post-image user config rules.
-UserBuildConfigRulePostImage ;
+include HaikuImageCommon ;
diff --git a/build/jam/images/HaikuImageCommon b/build/jam/images/HaikuImageCommon
new file mode 100644
index 0000000000..610f30a7ab
--- /dev/null
+++ b/build/jam/images/HaikuImageCommon
@@ -0,0 +1,199 @@
+#pragma mark - Optional Packages
+
+
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
+
+
+#pragma mark - User/Group Setup
+
+
+# add the root user and the root and users groups
+AddUserToHaikuImage $(HAIKU_ROOT_USER_NAME:E=baron) : 0 : 0 : /boot/home
+	: /bin/bash : $(HAIKU_ROOT_USER_REAL_NAME:E="Root User") ;
+AddGroupToHaikuImage root : 0 : ;
+AddGroupToHaikuImage users : 100 : ;
+
+
+#pragma mark - Host Name
+
+
+if $(HAIKU_IMAGE_HOST_NAME) {
+	actions BuildHaikuImageHostnameFile
+	{
+		echo "$(HAIKU_IMAGE_HOST_NAME)" > $(1)
+	}
+
+	local file = <haiku-image>hostname ;
+	Always $(file) ;
+	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
+	BuildHaikuImageHostnameFile $(file) ;
+	AddFilesToHaikuImage common settings network : $(file) ;
+}
+
+
+#pragma mark - Build The Image
+
+
+# Execute pre-image user config rules.
+UserBuildConfigRulePreImage	;
+
+# Set image name and directory defaults and locate the image.
+HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
+HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ;
+HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ;
+HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 300 MB
+HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ;
+MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
+
+# Set the default installation directory.
+HAIKU_INSTALL_DIR ?= $(HAIKU_DEFAULT_INSTALL_DIR) ;
+
+# the pseudo target all image contents is attached to
+NotFile $(HAIKU_IMAGE_CONTAINER_NAME) ;
+
+# prepare the script that initializes the shell variables
+HAIKU_IMAGE_INIT_VARIABLES_SCRIPT = <HaikuImage>haiku.image-init-vars ;
+local script = $(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT) ;
+MakeLocate $(script) : $(HAIKU_OUTPUT_DIR) ;
+Always $(script) ;
+
+AddVariableToScript $(script) : sourceDir : $(HAIKU_TOP) ;
+AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
+AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
+AddVariableToScript $(script) : downloadDir : $(HAIKU_DOWNLOAD_DIR) ;
+AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
+#AddVariableToScript $(script) : isImage : 1 ;
+AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
+AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
+AddVariableToScript $(script) : addBuildCompatibilityLibDir
+	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
+AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
+AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
+AddTargetVariableToScript $(script) : <build>addattr ;
+AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
+AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ;
+AddTargetVariableToScript $(script) : <build>copyattr ;
+AddTargetVariableToScript $(script) : <build>create_image : createImage ;
+AddTargetVariableToScript $(script) : <build>makebootable ;
+AddTargetVariableToScript $(script) : <build>package ;
+AddTargetVariableToScript $(script) : <build>rc ;
+AddTargetVariableToScript $(script) : <build>resattr ;
+AddTargetVariableToScript $(script) : <build>get_package_dependencies
+	: getPackageDependencies ;
+AddTargetVariableToScript $(script) : <build>unzip ;
+AddTargetVariableToScript $(script) : <build>vmdkimage ;
+AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
+if $(HOST_RM_ATTRS_TARGET) {
+	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
+} else {
+	AddVariableToScript $(script) : rmAttrs : rm ;
+}
+
+# Add a variable to indicate whether packages dependencies shall be resolved. We
+# always want to do that in non-update mode, but also in update mode when all
+# packages are updated.
+local resolvePackageDependencies ;
+if ! [ IsUpdateHaikuImageOnly ] || $(HAIKU_UPDATE_ALL_PACKAGES) {
+	resolvePackageDependencies = 1 ;
+}
+AddVariableToScript $(script) : resolvePackageDependencies
+	: $(resolvePackageDependencies) ;
+
+# Add variables "systemPackages" and "commonPackages" with the packages
+# copied/updated.
+local container = $(HAIKU_IMAGE_CONTAINER_NAME) ;
+local allPackages = [ on $(container) return $(HAIKU_PACKAGES_IN_IMAGE) ] ;
+if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
+	&& ! [ IncludeAllTargetsInContainer $(container) ] {
+	allPackages = [ FilterContainerUpdateTargets $(allPackages)
+		: HAIKU_INCLUDE_IN_IMAGE ] ;
+}
+
+local systemPackages ;
+local commonPackages ;
+local package ;
+for package in $(allPackages) {
+	if [ on $(package) return $(HAIKU_PACKAGE_INSTALLATION_LOCATION) ]
+			= system {
+		systemPackages += $(package) ;
+	} else {
+		commonPackages += $(package) ;
+	}
+}
+
+AddTargetVariableToScript $(script) : $(systemPackages) : systemPackages ;
+AddTargetVariableToScript $(script) : $(commonPackages) : commonPackages ;
+
+# Generate the repository package lists and add variables for the repositories.
+local repository ;
+local repositoryFiles ;
+for repository in $(HAIKU_REPOSITORIES) {
+	repositoryFiles
+		+= [ on $(repository) return $(HAIKU_REPOSITORY_CACHE_FILE) ] ;
+}
+
+AddTargetVariableToScript $(script) : $(repositoryFiles) : repositories ;
+
+# create the other scripts
+HAIKU_IMAGE_MAKE_DIRS_SCRIPT = <HaikuImage>haiku.image-make-dirs ;
+HAIKU_IMAGE_COPY_FILES_SCRIPT = <HaikuImage>haiku.image-copy-files ;
+HAIKU_IMAGE_EXTRACT_FILES_SCRIPT = <HaikuImage>haiku.image-extract-files ;
+MakeLocate $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) $(HAIKU_IMAGE_COPY_FILES_SCRIPT)
+	$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ;
+
+CreateHaikuImageMakeDirectoriesScript $(HAIKU_IMAGE_MAKE_DIRS_SCRIPT) ;
+CreateHaikuImageCopyFilesScript $(HAIKU_IMAGE_COPY_FILES_SCRIPT) ;
+CreateHaikuImageExtractFilesScript $(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT) ;
+
+# Convenience wrapper rule around BuildHaikuImage.
+rule _BuildHaikuImage image : isImage : isVMwareImage
+{
+	# _BuildHaikuImage <image target> : <isImage> : <isVMwareImage> ;
+	#
+
+	# build the image
+	# HAIKU_IMAGE_EARLY_USER_SCRIPTS, HAIKU_IMAGE_LATE_USER_SCRIPTS can be
+	# specified by the user.
+	BuildHaikuImage $(image) :
+		$(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT)
+		$(HAIKU_IMAGE_EARLY_USER_SCRIPTS)
+		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
+		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
+		$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT)
+		$(HAIKU_IMAGE_LATE_USER_SCRIPTS)
+		: $(isImage)
+		: $(isVMwareImage)
+	;
+
+	# remove the scripts we have generated
+	RmTemps $(image) :
+		$(HAIKU_IMAGE_INIT_VARIABLES_SCRIPT)
+		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
+		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
+		$(HAIKU_IMAGE_EXTRACT_FILES_SCRIPT)
+	;
+}
+
+# build the image
+_BuildHaikuImage $(HAIKU_IMAGE) : true ;
+NotFile haiku-image ;
+Depends haiku-image : $(HAIKU_IMAGE) ;
+
+
+# install Haiku into a directory
+NotFile install-haiku ;
+_BuildHaikuImage install-haiku : 0 ;
+
+
+# build the VMware image
+HAIKU_VMWARE_IMAGE_NAME ?= $(HAIKU_DEFAULT_VMWARE_IMAGE_NAME) ;
+HAIKU_VMWARE_IMAGE = $(HAIKU_VMWARE_IMAGE_NAME) ;
+MakeLocate $(HAIKU_VMWARE_IMAGE) : $(HAIKU_IMAGE_DIR) ;
+
+_BuildHaikuImage $(HAIKU_VMWARE_IMAGE) : true : true ;
+NotFile haiku-vmware-image ;
+Depends haiku-vmware-image : $(HAIKU_VMWARE_IMAGE) ;
+
+# Execute post-image user config rules.
+UserBuildConfigRulePostImage ;