diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 90b0867eaf..df80f9ea5e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -27,6 +27,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	Subversion
 #	Vision
 #	VLC
+#	Welcome
 #	WonderBrush
 #	Yasm
 
@@ -413,6 +414,14 @@ if [ IsOptionalHaikuImagePackageAdded VLC ] {
 	}
 }
 
+# Welcome
+if [ IsOptionalHaikuImagePackageAdded Welcome ] {
+	CopyDirectoryToHaikuImage beos documentation
+		: [ FDirName $(HAIKU_TOP) docs welcome ]
+		: welcome : -x .svn ;
+	AddSymlinkToHaikuImage home Desktop
+		: /boot/beos/documentation/welcome/welcome.html : Welcome ;
+}
 
 # WonderBrush
 if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
diff --git a/data/common/boot/post_install/mime_update.sh b/data/common/boot/post_install/mime_update.sh
index 78f7bca9b7..d3b0308de8 100755
--- a/data/common/boot/post_install/mime_update.sh
+++ b/data/common/boot/post_install/mime_update.sh
@@ -3,6 +3,7 @@
 # Make sure all apps have a MIME DB entry.
 
 mimeset -apps -f /boot/beos/apps
+mimeset -f /boot/beos/documentation
 mimeset -apps -f /boot/beos/preferences
 mimeset -apps -f /boot/beos/system/servers
 mimeset -apps -f /boot/apps