diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 6650bb3a6e..d90829064a 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -363,6 +363,10 @@ local bisonFiles = "yacc.c" "c.m4" "c++.m4" ;
 SEARCH on $(bisonFiles) = [ FDirName $(HAIKU_TOP) src bin bison data ] ;
 AddFilesToHaikuImage beos etc : $(bisonFiles) ;
 
+# fresh install indicator file
+SEARCH on <settings>fresh_install = [ FDirName $(HAIKU_TOP) data settings ] ;
+AddFilesToHaikuImage home config settings : <settings>fresh_install ;
+
 # boot loader
 AddFilesToHaikuImage beos system : zbeos ;
 
diff --git a/data/settings/fresh_install b/data/settings/fresh_install
new file mode 100644
index 0000000000..c2d6a0c50d
--- /dev/null
+++ b/data/settings/fresh_install
@@ -0,0 +1 @@
+This file is only supposed to exist on fresh Haiku installations.
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index b60a460286..77775a953f 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -121,3 +121,15 @@ if [ "$SAFEMODE" != "yes" ]; then
 		. $HOME/config/boot/UserBootscript
 	fi
 fi
+
+# Check for fresh install and register all bundled app mimetypes
+FRESH_INSTALL_INDICATOR_FILE=$HOME/config/settings/fresh_install
+if [ -e $FRESH_INSTALL_INDICATOR_FILE ]; then
+	mimeset -all -f /boot/beos/apps
+	mimeset -all -f /boot/beos/preferences
+	mimeset -all -f /boot/beos/system/servers
+	mimeset -all -f /boot/apps
+	rm $FRESH_INSTALL_INDICATOR_FILE
+fi
+
+