diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 08b19aa185..f7b921cf67 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -317,6 +317,10 @@ AddFilesToHaikuImage system bin			: installoptionalpackage ;
 SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToHaikuImage system bin			: install-wifi-firmwares.sh ;
 
+# Record the installed optional packages. To be used by installoptionalpackage.
+AddDirectoryToHaikuImage common data optional-packages ;
+AddInstalledPackagesFileToHaikuImage ;
+
 AddSymlinkToHaikuImage system bin : bash : sh ;
 AddSymlinkToHaikuImage system bin : trash : untrash ;
 
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index e762725fac..592d3da2ac 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -926,6 +926,22 @@ rule AddExpanderRuleToHaikuImage mimetype : extension : list : extract
 		: $(entry) ;
 }
 
+rule AddInstalledPackagesFileToHaikuImage
+{
+	#AddInstalledPackagesFileToHaikuImage
+	local file = <haiku-image>InstalledPackages ;
+
+	Always $(file) ;
+	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
+	BuildHaikuImageInstalledPackagesFile $(file) ;
+	AddFilesToHaikuImage common data : $(file) ;
+}
+
+actions BuildHaikuImageInstalledPackagesFile
+{
+	echo -e "$(HAIKU_ADDED_OPTIONAL_PACKAGES)" | tr '\ ' '\n'  > $(1)
+}
+
 rule AddOptionalPackageDescriptionToHaikuImage file : searchPath
 {
 	if $(searchPath) {