diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 3e1f02061f..afac21fdbe 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -341,6 +341,9 @@ local userBootScripts = UserBootscript.sample UserSetupEnvironment.sample ;
 SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
 AddFilesToHaikuImage home config boot : $(userBootScripts) ;
 
+# Add Autostart directory
+AddDirectoryToHaikuImage home config boot Autostart ;
+
 local logoArtwork = "HAIKU logo - white on blue - big.png"
 	"HAIKU logo - white on blue - normal.png" ;
 SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 5540020f2f..6951171d25 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -152,6 +152,14 @@ if [ "$SAFEMODE" != "yes" ]; then
 	fi
 fi
 
+# Start all programs in the Autostart folder
+if [ "$SAFEMODE" != "yes" ]; then
+	for program in $HOME/config/boot/Autostart/* 
+	do 
+		"$program" & 
+	done
+fi
+
 # Check for fresh install and run post install scripts.
 postInstallDir=/boot/common/boot/post_install
 freshInstallIndicator=/boot/common/settings/fresh_install