Index: virtualbox/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- virtualbox.orig/src/VBox/Installer/solaris/Makefile.kmk	2014-06-06 23:49:49.463744553 +0400
+++ virtualbox/src/VBox/Installer/solaris/Makefile.kmk	2014-06-07 11:09:52.691655274 +0400
@@ -103,6 +103,43 @@
 PROGRAMS         += VBoxZoneAccess VBoxISAExec
 INSTALLS         += solaris-doc solaris-bin solaris-drv-confs solaris-icons
 
+# Copied from linux, yeah:
+INSTALLS += linux-misc
+linux-misc_INST = bin/
+linux-misc_MODE = a+r,u+w
+linux-misc_SOURCES = \
+	$(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
+	$(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
+	$(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
+	$(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \
+	$(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,)
+linux-misc_CLEAN = \
+    $(linux-misc_0_OUTDIR)/generated.sh \
+    $(linux-misc_0_OUTDIR)/virtualbox.desktop
+
+# Unset this to speed up things during makefile hacking.
+VBOX_LNX_INST_DEP_ON_MAKEFILE := $(MAKEFILE_CURRENT)
+
+$$(linux-misc_0_OUTDIR)/generated.sh: $(VBOX_VERSION_STAMP) $(VBOX_LNX_INST_DEP_ON_MAKEFILE) | $$(dir $$@)
+	$(call MSG_GENERATE,,$@,$<)
+	$(QUIET)$(RM) -f '$@'
+	$(QUIET)$(APPEND) '$@' 'VBOX_PRODUCT="$(VBOX_PRODUCT)"'
+	$(QUIET)$(APPEND) '$@' 'VBOX_VERSION_STRING="$(VBOX_VERSION_STRING)"'
+	$(QUIET)$(APPEND) '$@' 'VBOX_C_YEAR="$(VBOX_C_YEAR)"'
+	$(QUIET)$(APPEND) '$@' 'VBOX_VENDOR="$(VBOX_VENDOR)"'
+
+$$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
+	$(call MSG_GENERATE,,$@,$<)
+ifdef VBOX_PATH_PACKAGE_DOCS
+	$(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_PATH_PACKAGE_DOCS)+" \
+		-e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+		--output $@ $<
+else
+	$(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
+		-e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+		--output $@ $<
+endif
+
 BLDDIRS          += \
 	$(SOLARIS_INST_OUT_DIR) \
 	$(SOLARIS_BASEINST_DIR) \
@@ -173,21 +210,25 @@
 
 solaris-icons_INST = bin/icons/
 solaris-icons_MODE = a+r,u+w
-solaris-icons_SOURCES = $(VBOX_MIME_ICONS)
+solaris-icons_SOURCES = $(VBOX_MIME_ICONS) $(VBOX_DESKTOP_ICONS)
 
 BLDDIRS += \
 	$(SOLARIS_USR_DIR)/share \
 	$(SOLARIS_USR_DIR)/share/icons \
 	$(SOLARIS_USRSHR_ICONS_DIR) \
     $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-	    $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \
-	    $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes)
+	    $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s))
 
 VBOX_MIME_ICONS = \
 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
 	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-	            virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
+	            virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
+
+VBOX_DESKTOP_ICONS = \
+	$(addprefix $(PATH_ROOT)/src/VBox/Resources/$(if $(VBOX_OSE),OSE,NonOSE)/,\
+	    $(foreach s,16 20 32 40 48 64 128,\
+		virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png))
 
 SOLARIS_COMMON_ICONS = \
 	$(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \