Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 35221)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 35222)
@@ -327,15 +327,15 @@
 	  libQtSqlVBox.so.4 \
 	  libQt3SupportVBox.so.4,)
-endif
-
-
-ifdef VBOX_WITH_QTGUI
+
  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
- SOLARIS_NO_STRIP += $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
+ SOLARIS_COMMON = $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
+else
+ SOLARIS_QTLIBS =
+ SOLARIS_COMMON =
 endif
 
 # Documentation (packed as DOCS as they are arch. neutral)
 ifdef VBOX_WITH_DOCS_PACKING
- SOLARIS_COMMON = \
+ SOLARIS_COMMON += \
 	VirtualBox.chm \
 	UserManual.pdf \
@@ -474,12 +474,11 @@
 	additions \
 	rdesktop-vrdp-keymaps \
+	nls \
 	$(SOLARIS_DIR_NAME_64) \
 	$(SOLARIS_DIR_NAME_64)/components \
-	$(SOLARIS_DIR_NAME_64)/nls \
 	$(SOLARIS_DIR_NAME_64)/accessible \
 	$(VBOX_SOL_PYTHON_DIR_64) \
 	$(SOLARIS_DIR_NAME_32) \
 	$(SOLARIS_DIR_NAME_32)/components \
-	$(SOLARIS_DIR_NAME_32)/nls \
 	$(SOLARIS_DIR_NAME_32)/accessible \
 	$(if $(VBOX_WITH_PYTHON),\
@@ -508,5 +507,4 @@
 	$(SOLARIS_DIR_NAME_32) \
 	$(SOLARIS_DIR_NAME_32)/components \
-	$(SOLARIS_DIR_NAME_32)/nls \
 	$(SOLARIS_DIR_NAME_32)/accessible \
 ,$(SOLARIS_DBG_DIR)/$(d))
Index: /trunk/src/VBox/Runtime/r3/path.cpp
===================================================================
--- /trunk/src/VBox/Runtime/r3/path.cpp	(revision 35221)
+++ /trunk/src/VBox/Runtime/r3/path.cpp	(revision 35222)
@@ -86,5 +86,5 @@
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
     return RTStrCopy(pszPath, cchPath, RTPATH_APP_PRIVATE);
-#elif defined(RT_OS_SOLARIS) && 0 /// @todo fix this
+#elif defined(RT_OS_SOLARIS)
     return rtPathSolarisArchHack(pszPath, cchPath);
 #else