Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 35091)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 35092)
@@ -47,5 +47,7 @@
 SOLARIS_USRBIN_DIR         := $(SOLARIS_USR_DIR)/bin
 SOLARIS_USRSHR_APPS_DIR    := $(SOLARIS_USR_DIR)/share/applications
+SOLARIS_USRSHR_APPREG_DIR  := $(SOLARIS_USR_DIR)/share/application-registry
 SOLARIS_USRSHR_MIMEXML_DIR := $(SOLARIS_USR_DIR)/share/mime/packages
+SOLARIS_USRSHR_MIMEINFO_DIR := $(SOLARIS_USR_DIR)/share/mime-info
 SOLARIS_USRSHR_ICONS_DIR   := $(SOLARIS_USR_DIR)/share/icons/hicolor
 SOLARIS_USRSHR_PIXMAPS_DIR := $(SOLARIS_USR_DIR)/share/pixmaps
@@ -574,5 +576,7 @@
 	$(QUIET)$(MKDIR) -p $(SOLARIS_VBOXSMF_DIR)
 	$(QUIET)$(if $(VBOX_WITH_QTGUI),$(MKDIR) -p $(SOLARIS_USRSHR_APPS_DIR),)
+	$(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_APPREG_DIR)
 	$(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_MIMEXML_DIR)
+	$(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_MIMEINFO_DIR)
 	$(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_PIXMAPS_DIR)
 	$(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0    $(SOLARIS_ETC_DIR)/hostname.vboxnet0,)
@@ -635,7 +639,23 @@
 		-e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
 		-e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
-		--output $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop \
+		--output $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop.tmp \
 		$(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in
-	$(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml                        $(SOLARIS_USRSHR_MIMEXML_DIR)/virtualbox.xml
+	$(QUIET)$(INSTALL) -m 0644 $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop.tmp                            $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop
+    $(QUIET)$(RM) -f $(SOLARIS_USRSHR_APPS_DIR)/virtualbox.desktop.tmp
+	# S10 cannot deal with icon information in virtrtualbox.xml
+	$(QUIET)$(SED) \
+		-e '/<icon/d' \
+		--output $(SOLARIS_USRSHR_MIMEXML_DIR)/virtualbox.xml.tmp \
+		$(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml
+	$(QUIET)$(INSTALL) -m 0644 $(SOLARIS_USRSHR_MIMEXML_DIR)/virtualbox.xml.tmp                             $(SOLARIS_USRSHR_MIMEXML_DIR)/virtualbox.xml
+    $(QUIET)$(RM) -f $(SOLARIS_USRSHR_MIMEXML_DIR)/virtualbox.xml.tmp
+	$(QUIET)$(SED) \
+		-e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+		--output $(SOLARIS_USRSHR_APPREG_DIR)/virtualbox.applications.tmp \
+		$(VBOX_PATH_SOL_INST_SRC)/virtualbox.applications.in
+	$(QUIET)$(INSTALL) -m 0644 $(SOLARIS_USRSHR_APPREG_DIR)/virtualbox.applications.tmp                     $(SOLARIS_USRSHR_APPREG_DIR)/virtualbox.applications
+    $(QUIET)$(RM) -f $(SOLARIS_USRSHR_APPREG_DIR)/virtualbox.applications.tmp
+	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.keys                                    $(SOLARIS_USRSHR_MIMEINFO_DIR)/virtualbox.keys
+	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.mime                                    $(SOLARIS_USRSHR_MIMEINFO_DIR)/virtualbox.mime
 	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/postinstall.sh                                     $(SOLARIS_BASEINST_DIR)/postinstall.sh
 	$(QUIET)$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN)/VBox.png                                                  $(SOLARIS_USRSHR_PIXMAPS_DIR)/VBox.png
Index: /trunk/src/VBox/Installer/solaris/virtualbox.applications.in
===================================================================
--- /trunk/src/VBox/Installer/solaris/virtualbox.applications.in	(revision 35092)
+++ /trunk/src/VBox/Installer/solaris/virtualbox.applications.in	(revision 35092)
@@ -0,0 +1,8 @@
+virtualbox
+    command=VirtualBox
+    requires_terminal=false
+    expects_uris=false
+    can_open_multiple_files=true
+    name=@VBOX_PRODUCT@
+    mime_types=application/x-virtualbox-vbox;application/x-virtualbox-vbox-extpack;application/x-virtualbox-ovf;application/x-virtualbox-ova
+
Index: /trunk/src/VBox/Installer/solaris/virtualbox.keys
===================================================================
--- /trunk/src/VBox/Installer/solaris/virtualbox.keys	(revision 35092)
+++ /trunk/src/VBox/Installer/solaris/virtualbox.keys	(revision 35092)
@@ -0,0 +1,40 @@
+application/x-virtualbox-vbox
+    icon_filename=virtualbox-vbox
+    description=Virtual Machine
+    default_action_type=application
+    short_list_application_ids_for_novice_user_level=virtualbox
+    short_list_application_ids_for_intermediate_user_level=virtualbox
+    short_list_application_ids_for_advanced_user_level=virtualbox
+    category=System
+    use_category_default=no
+
+application/x-virtualbox-vbox-extpack
+    icon_filename=virtualbox-vbox-extpack
+    description=VirtualBox Extension Pack
+    default_action_type=application
+    short_list_application_ids_for_novice_user_level=virtualbox
+    short_list_application_ids_for_intermediate_user_level=virtualbox
+    short_list_application_ids_for_advanced_user_level=virtualbox
+    category=System
+    use_category_default=no
+
+application/x-virtualbox-ovf
+    icon_filename=virtualbox-ovf
+    description=Open Virtualization Format
+    default_action_type=application
+    short_list_application_ids_for_novice_user_level=virtualbox
+    short_list_application_ids_for_intermediate_user_level=virtualbox
+    short_list_application_ids_for_advanced_user_level=virtualbox
+    category=System
+    use_category_default=no
+
+application/x-virtualbox-ovf
+    icon_filename=virtualbox-ova
+    description=Open Virtualization Format Archive
+    default_action_type=application
+    short_list_application_ids_for_novice_user_level=virtualbox
+    short_list_application_ids_for_intermediate_user_level=virtualbox
+    short_list_application_ids_for_advanced_user_level=virtualbox
+    category=System
+    use_category_default=no
+
Index: /trunk/src/VBox/Installer/solaris/virtualbox.mime
===================================================================
--- /trunk/src/VBox/Installer/solaris/virtualbox.mime	(revision 35092)
+++ /trunk/src/VBox/Installer/solaris/virtualbox.mime	(revision 35092)
@@ -0,0 +1,11 @@
+application/x-virtualbox-vbox:
+    ext: vbox
+
+application/x-virtualbox-vbox-extpack
+    ext: vbox-extpack
+
+application/x-virtualbox-ovf
+    ext: ovf
+
+application/x-virtualbox-ova
+    ext: ova