diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index daa7e651e0..e88c9cf7c3 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -172,8 +172,8 @@ rule DefineDefaultBuildProfiles
 				libedit_devel
 				m4
 				make
-				ncurses
-				ncurses_devel
+				ncurses6
+				ncurses6_devel
 				python
 				sed
 				texinfo
@@ -197,8 +197,8 @@ rule DefineDefaultBuildProfiles
 						libsolv
 						libedit
 						libedit_devel
-						ncurses
-						ncurses_devel
+						ncurses6
+						ncurses6_devel
 						zlib
 						zlib_devel
 						;
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index cee5261f0a..49aa91fbb6 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -126,6 +126,14 @@ local bootScripts = PostInstallScript SetupEnvironment
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
 AddFilesToPackage boot : $(bootScripts) ;
 
+local launchScripts = <data!launch>system ;
+SEARCH on $(launchScripts) = [ FDirName $(HAIKU_TOP) data launch ] ;
+AddFilesToPackage data launch : $(launchScripts) ;
+
+local userLaunchScripts = <data!launch>user ;
+SEARCH on $(userLaunchScripts) = [ FDirName $(HAIKU_TOP) data launch ] ;
+AddFilesToPackage data user_launch : $(userLaunchScripts) ;
+
 # post install scripts
 local postInstallFiles = default_deskbar_items.sh ;
 postInstallFiles = $(postInstallFiles:G=post-install) ;