diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 32d3a04edb..57df1c2d63 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -307,16 +307,9 @@ SEARCH on $(networkSettingsFiles)
 	= [ FDirName $(HAIKU_TOP) data settings network ] ;
 AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
 
-# post install scripts and fresh install indicator file
-local postInstallFiles = add_catalog_entry_attributes.sh
-	default_deskbar_items.sh mime_update.sh ;
-postInstallFiles = $(postInstallFiles:G=post-install) ;
-SEARCH on $(postInstallFiles)
-	= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
+# fresh install indicator file for the post install scripts
 SEARCH on <post-install>fresh_install
 	= [ FDirName $(HAIKU_TOP) data common settings ] ;
-AddFilesToHaikuImage common boot post_install
-	: $(postInstallFiles) ;
 AddFilesToHaikuImage common settings : <post-install>fresh_install ;
 
 # boot loader
diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index bc0cd80b3b..4df7c27625 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -154,6 +154,14 @@ local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
 AddFilesToPackage boot : $(bootScripts) ;
 
+# post install scripts
+local postInstallFiles = add_catalog_entry_attributes.sh
+	default_deskbar_items.sh mime_update.sh ;
+postInstallFiles = $(postInstallFiles:G=post-install) ;
+SEARCH on $(postInstallFiles)
+	= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
+AddFilesToPackage boot post_install : $(postInstallFiles) ;
+
 # artwork and sounds
 local logoArtwork =
 	$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index e37bc59ab5..e6faaa76fa 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -178,14 +178,15 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Check for fresh install and run post install scripts.
-postInstallDir=/boot/common/boot/post_install
+postInstallDir=boot/post_install
 freshInstallIndicator=/boot/common/settings/fresh_install
 if [ -e $freshInstallIndicator ]; then
 	# wait a moment for things to calm down a bit
 	sleep 3
 
 	# execute scripts
-	for f in $postInstallDir/*.sh; do
+	for f in /boot/system/$postInstallDir/*.sh /boot/common/$postInstallDir/*.sh
+	do
 		if [ -f $f ]; then
 			echo "Running post install script $f ..." > /dev/dprintf
 			$f